Changeset 699

Timestamp:

02/05/03 23:16:20 (21 years ago)

Author:

jalet

Message:

DEVICE_URI is undefined outside of CUPS, i.e. for normal command line tools

Location:

pykota/trunk

Files:

• bin/pykota (modified) (2 diffs)
• pykota/tool.py (modified) (3 diffs)

pykota/trunk/bin/pykota

@@ -17 +17 @@
 #
 # $Log$
+# Revision 1.2  2003/02/05 22:16:20  jalet
+# DEVICE_URI is undefined outside of CUPS, i.e. for normal command line tools
+#
 # Revision 1.1  2003/02/05 21:28:17  jalet
 # Initial import into CVS
@@ -34 +37 @@
         self.username = username
         self.requester = requester.openRequester(self.config, self.printername)
+        self.printerhostname = self.getPrinterHostname()
     
+    def getPrinterHostname(self) :
+        """Returns the printer hostname."""
+        device_uri = os.environ.get("DEVICE_URI", "")
+        # TODO : check this for more complex urls than ipp://myprinter.dot.com:631/printers/lp
+        try :
+            (backend, destination) = device_uri.split(":", 1) 
+        except ValueError :    
+            raise PyKotaToolError, "Invalid DEVICE_URI : %s\n" % device_uri
+        while destination.startswith("/") :
+            destination = destination[1:]
+        return destination.split("/")[0].split(":")[0]
+        
     def filterInput(self, inputfile) :
         """Transparent filter."""

pykota/trunk/pykota/tool.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.3  2003/02/05 22:16:20  jalet
+# DEVICE_URI is undefined outside of CUPS, i.e. for normal command line tools
+#
 # Revision 1.2  2003/02/05 22:10:29  jalet
 # Typos
@@ -49 +52 @@
         self.storage = storage.openConnection(self.config, asadmin=(not isfilter))
         self.printername = os.environ.get("PRINTER", None)
-        self.printerhostname = self.getPrinterHostname()
         self.smtpserver = self.config.getSMTPServer()
         self.admin = self.config.getAdmin()
@@ -71 +73 @@
         self.sendMessage(self.adminmail, "Subject: %s\n\n%s" % (subject, message))
         
-    def getPrinterHostname(self) :
-        """Returns the printer hostname."""
-        device_uri = os.environ.get("DEVICE_URI", "")
-        # TODO : check this for more complex urls than ipp://myprinter.dot.com:631/printers/lp
-        try :
-            (backend, destination) = device_uri.split(":", 1) 
-        except ValueError :    
-            raise PyKotaToolError, "Invalid DEVICE_URI : %s\n" % device_uri
-        while destination.startswith("/") :
-            destination = destination[1:]
-        return destination.split("/")[0].split(":")[0]
-        
     def warnQuotaPrinter(self, username) :
         """Checks a user quota and send him a message if quota is exceeded on current printer."""