[lib/impression_canon, intranet/impression] gestion de pdfbook

Ignore-this: 11acbb5ac4700d722236fd5f169933b2

darcs-hash:20090516015444-bd074-71fb4a65b486706af7d6b6a780ec4782b0935f53.gz

intranet/modules/impression/main.py

@@ -25,6 +25,9 @@
 # #############################################################
 
 import cherrypy, tempfile, shutil, os, commands, re
+from re import compile
+BOOK_REGEXP = compile('book.pdf')
+
 from crans.impression.impression_canon import FichierInvalide,SoldeInsuffisant,impression
 import crans.impression.digicode
 import crans.impression.etat_imprimante
@@ -32,6 +35,7 @@ import crans.cp
 from threading import Thread
 FILE_UPLOAD_BASE_FOLDER = cherrypy.config.get('fileUpload.folder', "/var/impression/fichiers/")
 
+
 class FileError(Exception):
     pass
 from ClassesIntranet.ModuleBase import ModuleBase
@@ -244,7 +248,8 @@ class main(ModuleBase):
         # exclusion des fichiers qui ne sont pas des PDF
         for f in liste:
             if commands.getoutput('file -ib %s' % commands.mk2arg(file_folder, f)) == "application/pdf":
-                list_pdf.append(f)
+                if not BOOK_REGEXP.search(f):
+                    list_pdf.append(f)
         return list_pdf