FIX: Druckereintellung (RZ und UB2)

Signed-off-by: Javier Castillo <javier.castillo@rz.uni-freiburg.de>

15 files changed, 37 insertions, 23 deletions

diff --git a/AccountValue.suo b/AccountValue.suo
index 0275adb..ae00fad 100644
--- a/AccountValue.suo
+++ b/AccountValue.suo
diff --git a/AccountValue/DEVICES.XML b/AccountValue/DEVICES.XML
index 3883ff9..53aa961 100644
--- a/AccountValue/DEVICES.XML
+++ b/AccountValue/DEVICES.XML
@@ -3,19 +3,19 @@
   <RZ>

     <printer param="4">

       <printer1>

-        <path param="\\pub-ps01.public.ads.uni-freiburg.de"></path>

-        <name param="rzps1"></name>

+        <path param="\\pub-ps03.public.ads.uni-freiburg.de"></path>

+        <name param="rz01"></name>

       </printer1>

       <printer2>

-        <path param="\\pub-ps01.public.ads.uni-freiburg.de"></path>

-        <name param="rzps2"></name>

+        <path param="\\pub-ps03.public.ads.uni-freiburg.de"></path>

+        <name param="rz02"></name>

       </printer2>

       <printer3>

-        <path param="\\pub-ps01.public.ads.uni-freiburg.de"></path>

+        <path param="\\pub-ps03.public.ads.uni-freiburg.de"></path>

         <name param="rzpooloce1"></name>

       </printer3>

       <printer4>

-        <path param="\\pub-ps01.public.ads.uni-freiburg.de"></path>

+        <path param="\\pub-ps03.public.ads.uni-freiburg.de"></path>

         <name param="rzpooloce2"></name>

       </printer4>

     </printer>

@@ -23,23 +23,23 @@
   <UB>

     <printer param="2">

       <printer1>

-        <path param="\\pub-ps01.public.ads.uni-freiburg.de"></path>

-        <name param="ubps1"></name>

+        <path param="\\pub-ps03.public.ads.uni-freiburg.de"></path>

+        <name param="ub201"></name>

       </printer1>

       <printer2>

-        <path param="\\pub-ps01.public.ads.uni-freiburg.de"></path>

-        <name param="ubps2"></name>

+        <path param="\\pub-ps03.public.ads.uni-freiburg.de"></path>

+        <name param="ub202"></name>

       </printer2>

     </printer>

   </UB>

   <CHEMIE>

     <printer param="2">

       <printer1>

-        <path param="\\pub-ps01.public.ads.uni-freiburg.de"></path>

+        <path param="\\pub-ps03.public.ads.uni-freiburg.de"></path>

         <name param="chemieco"></name>

       </printer1>

       <printer2>

-        <path param="\\pub-ps01.public.ads.uni-freiburg.de"></path>

+        <path param="\\pub-ps03.public.ads.uni-freiburg.de"></path>

         <name param="chemiesw"></name>

       </printer2>

     </printer>

diff --git a/AccountValue/Form1.cs b/AccountValue/Form1.cs
index 5d5170c..8472718 100644
--- a/AccountValue/Form1.cs
+++ b/AccountValue/Form1.cs
@@ -277,7 +277,8 @@ namespace AccountValue
                 try

                 {

                     oNetDrive.LocalDrive = "";

-                    oNetDrive.ShareName = "\\\\pub-ps01.public.ads.uni-freiburg.de";

+                    //oNetDrive.ShareName = "\\\\pub-ps01.public.ads.uni-freiburg.de";

+                    oNetDrive.ShareName = "\\\\pub-ps03.public.ads.uni-freiburg.de";

                     oNetDrive.MapDrive("PUBLIC\\" + textBox1.Text, maskedTextBox1.Text);

                 }

                 catch

@@ -291,40 +292,52 @@ namespace AccountValue
             {

                 try

                 {

+                    // Installiere RZ-MONO

                     System.Diagnostics.ProcessStartInfo sendInfo;

                     sendInfo = new System.Diagnostics.ProcessStartInfo("cscript");

                     sendInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;

                     if (myOS == "WinXP")

-                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps1";

+                        //sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps1";

+                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\rz01";

                     if (myOS == "WinVista" || myOS == "Win7")

-                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps1";

+                        //sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps1";

+                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\rz01";

                     System.Diagnostics.Process.Start(sendInfo);

                     sendInfo = null;

 

+                    // Installiere RZ-FARBE

                     sendInfo = new System.Diagnostics.ProcessStartInfo("cscript");

                     sendInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;

                     if (myOS == "WinXP")

-                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps2";

+                        //sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps2";

+                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\rz02";

                     if (myOS == "WinVista" || myOS == "Win7")

-                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps2";

+                        //sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps2";

+                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\rz02";

                     System.Diagnostics.Process.Start(sendInfo);

                     sendInfo = null;

 

+                    // Installiere UB2-MONO

                     sendInfo = new System.Diagnostics.ProcessStartInfo("cscript");

                     sendInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;

                     if (myOS == "WinXP")

-                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps1";

+                        //sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps1";

+                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\ub201";

                     if (myOS == "WinVista" || myOS == "Win7")

-                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps1";

+                        //sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps1";

+                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\ub201";

                     System.Diagnostics.Process.Start(sendInfo);

                     sendInfo = null;

 

+                    // Installiere UB2-FARBE

                     sendInfo = new System.Diagnostics.ProcessStartInfo("cscript");

                     sendInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;

                     if (myOS == "WinXP")

-                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps2";

+                        //sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps2";

+                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\ub202";

                     if (myOS == "WinVista" || myOS == "Win7")

-                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps2";

+                        //sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps2";

+                        sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\ub202";

                     System.Diagnostics.Process.Start(sendInfo);

                     sendInfo = null;

                 }

@@ -339,7 +352,8 @@ namespace AccountValue
                 try

                 {

                     oNetDrive.LocalDrive = "";

-                    oNetDrive.ShareName = "\\\\pub-ps01.public.ads.uni-freiburg.de";

+                    //oNetDrive.ShareName = "\\\\pub-ps01.public.ads.uni-freiburg.de";

+                    oNetDrive.ShareName = "\\\\pub-ps03.public.ads.uni-freiburg.de";

                     oNetDrive.MapDrive("PUBLIC\\" + textBox1.Text, maskedTextBox1.Text);

                 }

                 catch

diff --git a/AccountValue/Form2.cs b/AccountValue/Form2.cs
index 24c4bf8..34d06b3 100644
--- a/AccountValue/Form2.cs
+++ b/AccountValue/Form2.cs
@@ -29,7 +29,7 @@ namespace AccountValue
     public partial class Form2 : Form

     {

         private DragExtender dragExtender1;

-        private String version = "0.5.0";

+        private String version = "0.5.1";

         /*

          * 

          */

diff --git a/AccountValue/bin/Release/AccountValue.exe b/AccountValue/bin/Release/AccountValue.exe
index a27fc8f..52e6098 100644
--- a/AccountValue/bin/Release/AccountValue.exe
+++ b/AccountValue/bin/Release/AccountValue.exe
diff --git a/AccountValue/bin/Release/AccountValue.pdb b/AccountValue/bin/Release/AccountValue.pdb
index 1b001a1..d2d78a3 100644
--- a/AccountValue/bin/Release/AccountValue.pdb
+++ b/AccountValue/bin/Release/AccountValue.pdb
diff --git a/AccountValue/bin/Release/Interop.IWshRuntimeLibrary.dll b/AccountValue/bin/Release/Interop.IWshRuntimeLibrary.dll
index 1398633..8a2cac8 100644
--- a/AccountValue/bin/Release/Interop.IWshRuntimeLibrary.dll
+++ b/AccountValue/bin/Release/Interop.IWshRuntimeLibrary.dll
diff --git a/AccountValue/bin/Release/Interop.SHDocVw.dll b/AccountValue/bin/Release/Interop.SHDocVw.dll
index 51c27d4..9396fbd 100644
--- a/AccountValue/bin/Release/Interop.SHDocVw.dll
+++ b/AccountValue/bin/Release/Interop.SHDocVw.dll
diff --git a/AccountValue/obj/Release/AccountValue.Properties.Resources.resources b/AccountValue/obj/Release/AccountValue.Properties.Resources.resources
index 259ee4a..1aa9122 100644
--- a/AccountValue/obj/Release/AccountValue.Properties.Resources.resources
+++ b/AccountValue/obj/Release/AccountValue.Properties.Resources.resources
diff --git a/AccountValue/obj/Release/AccountValue.csproj.GenerateResource.Cache b/AccountValue/obj/Release/AccountValue.csproj.GenerateResource.Cache
index ba0c099..98354a4 100644
--- a/AccountValue/obj/Release/AccountValue.csproj.GenerateResource.Cache
+++ b/AccountValue/obj/Release/AccountValue.csproj.GenerateResource.Cache
diff --git a/AccountValue/obj/Release/AccountValue.csproj.ResolveComReference.cache b/AccountValue/obj/Release/AccountValue.csproj.ResolveComReference.cache
index 8651e3d..3a9f25f 100644
--- a/AccountValue/obj/Release/AccountValue.csproj.ResolveComReference.cache
+++ b/AccountValue/obj/Release/AccountValue.csproj.ResolveComReference.cache
diff --git a/AccountValue/obj/Release/AccountValue.exe b/AccountValue/obj/Release/AccountValue.exe
index a27fc8f..52e6098 100644
--- a/AccountValue/obj/Release/AccountValue.exe
+++ b/AccountValue/obj/Release/AccountValue.exe
diff --git a/AccountValue/obj/Release/AccountValue.pdb b/AccountValue/obj/Release/AccountValue.pdb
index 1b001a1..d2d78a3 100644
--- a/AccountValue/obj/Release/AccountValue.pdb
+++ b/AccountValue/obj/Release/AccountValue.pdb
diff --git a/AccountValue/obj/Release/Interop.IWshRuntimeLibrary.dll b/AccountValue/obj/Release/Interop.IWshRuntimeLibrary.dll
index 1398633..8a2cac8 100644
--- a/AccountValue/obj/Release/Interop.IWshRuntimeLibrary.dll
+++ b/AccountValue/obj/Release/Interop.IWshRuntimeLibrary.dll
diff --git a/AccountValue/obj/Release/Interop.SHDocVw.dll b/AccountValue/obj/Release/Interop.SHDocVw.dll
index 51c27d4..9396fbd 100644
--- a/AccountValue/obj/Release/Interop.SHDocVw.dll
+++ b/AccountValue/obj/Release/Interop.SHDocVw.dll