Changeset 30586 for branches/czw_branch/20101203/PS-IPP-PStamp

Timestamp:

Feb 11, 2011, 4:29:48 PM (16 years ago)

Author:

watersc1

Message:

Trying to merge back into trunk.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (1 diff)
• PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm (modified) (5 diffs)

branches/czw_branch/20101203/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -17 +17 @@
                     resolve_project
                     getCamRunByCamID
+                    runToolAndParse
                     parse_md_fast
                     );

branches/czw_branch/20101203/PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm

@@ -29 +29 @@
                     $PSTAMP_SELECT_INVERSE
                     $PSTAMP_SELECT_UNCONV
+                    $PSTAMP_REQUEST_UNCENSORED
+                    $PSTAMP_REQUIRE_UNCENSORED
                     $PSTAMP_USE_IMFILE_ID
                     $PSTAMP_NO_WAIT_FOR_UPDATE
@@ -44 +46 @@
                     $PSTAMP_NO_JOBS_QUEUED
                     $PSTAMP_NO_OVERLAP
+                    $PSTAMP_NOT_AUTHORIZED
                     );
 our %EXPORT_TAGS = (standard => [@EXPORT_OK]);
@@ -64 +67 @@
 our $PSTAMP_USE_IMFILE_ID    = 16384;
 
-our $PSTAMP_NO_WAIT_FOR_UPDATE  = 32768;
+our $PSTAMP_NO_WAIT_FOR_UPDATE = 32768;
+our $PSTAMP_REQUEST_UNCENSORED = 1 << 16;
+our $PSTAMP_REQUIRE_UNCENSORED = 1 << 17;
 
 # job and result codes
@@ -82 +87 @@
 our $PSTAMP_NO_JOBS_QUEUED   = 27;
 our $PSTAMP_NO_OVERLAP       = 28;
+our $PSTAMP_NOT_AUTHORIZED   = 29;
 
 
@@ -119 +125 @@
 PSTAMP_NO_JOBS_QUEUED
 PSTAMP_NO_OVERLAP
+PSTAMP_NOT_AUTHORIZED
 );