Merge lp:~idlecool/sahana-eden/trunk into lp:sahana-eden

[Shiv Deepak]

Addresses FIXMEs in modules/s3/s3pdf.py, made UNIX style file paths portable.

[Fran Boon (flavour)]

Thanks, however the issue wasn't just the ./application, but also the "uploads/ocr_meta/", "uploads/ocr_payload/", etc

review: Needs Fixing

[lp:~idlecool/sahana-eden/trunk]

2668. By Fran Boon on 2011-08-16

Approve action button should send user email confirmation, PR menu fixed, ACL improved

2669. By Fran Boon on 2011-08-16

Merge Graeme: S3Survey progress

[Shiv Deepak (idlecool)]

> Thanks, however the issue wasn't just the ./application, but also the
> "uploads/ocr_meta/", "uploads/ocr_payload/", etc

ahh. I separated them too.

[Fran Boon (flavour)]

review: Approve

[lp:~idlecool/sahana-eden/trunk]

2670. By Fran Boon on 2011-08-16

merge idlecool: Fix portability of filepaths in OCR

=== modified file 'modules/s3/s3pdf.py'
--- modules/s3/s3pdf.py	2011-08-16 11:49:37 +0000
+++ modules/s3/s3pdf.py	2011-08-16 16:08:14 +0000
@@ -126,7 +126,7 @@
             Flowable.__init__(self)
             self.doc = doc
             self.title = newTitle
-    
+
         def draw(self):
             self.doc.title = self.title
 
@@ -135,7 +135,7 @@
             Flowable.__init__(self)
             self.function = callback
             self.data = data
-    
+
         def draw(self):
             self.function(self.canv, self.data)
 
@@ -148,7 +148,7 @@
             2) Even Page
             3) Odd Page
             4) Landscape Page
-            
+
         """
 
         def setPageTemplates(self,
@@ -193,7 +193,7 @@
         def build(self, flowables, canvasmaker=canvas.Canvas):
             """
                 build the document using the flowables.
-                
+
                 Set up the page templates that the document can use
 
             """
@@ -341,7 +341,7 @@
                     id = r.id
                 except:
                     id = None
-            
+
             callback(self, id=id)
             # build the document
             doc = self.buildDoc()
@@ -485,9 +485,9 @@
                         r.error(501, self.ERROR.INVALID_FORMID)
 
                     s3ocrxml_filename = row.s3ocrxml_file
-                    f = open(os.path.join("./applications/",
-                                          self.request.application,
-                                          "uploads/ocr_meta/",
+                    f = open(os.path.join(r.folder,
+                                          "uploads",
+                                          "ocr_meta",
                                           s3ocrxml_filename),
                              "rb")
                     s3ocrxml = f.read()
@@ -528,10 +528,9 @@
                             r.error(501, self.manager.ERROR.BAD_RECORD)
 
                         s3ocrdataxml_filename = row.data_file
-                        # FIXME!
-                        f = open(os.path.join("./applications/",
-                                              self.request.application,
-                                              "uploads/ocr_payload/",
+                        f = open(os.path.join(r.folder,
+                                              "uploads",
+                                              "ocr_payload",
                                               s3ocrdataxml_filename),
                                  "rb")
                         s3ocrdataxml = f.read()
@@ -588,11 +587,10 @@
                         r.error(501, self.manager.ERROR.BAD_RECORD)
 
                     format = row.image_file[-4:]
-                    # FIXME!
-                    image_file = open(os.path.join("./applications/",
-                                                  self.request.application,
-                                                  "uploads/ocr_payload/",
-                                                  row.image_file))
+                    image_file = open(os.path.join(r.folder,
+                                                   "uploads",
+                                                   "ocr_payload",
+                                                   row.image_file))
                     image_file_content = image_file.read()
                     image_file.close()
                     # Set content type and disposition headers
@@ -624,11 +622,10 @@
                     except(IndexError):
                         r.error(501, self.manager.ERROR.BAD_RECORD)
 
-                    # FIXME!
-                    data_file = open(os.path.join("./applications/",
-                                 self.request.application,
-                                 "uploads/ocr_payload/",
-                                 row.data_file))
+                    data_file = open(os.path.join(r.folder,
+                                                  "uploads",
+                                                  "ocr_payload",
+                                                  row.data_file))
                     formuuid = row.form_uuid
 
                     datafile_content = data_file.read()
@@ -642,10 +639,9 @@
                         r.error(501, self.ERROR.INVALID_FORMID)
 
                     s3ocrxml_filename = row.s3ocrxml_file
-                    # FIXME!
-                    f = open(os.path.join("./applications/",
-                                          self.request.application,
-                                          "uploads/ocr_meta/",
+                    f = open(os.path.join(r.folder,
+                                          "uploads",
+                                          "ocr_meta",
                                           s3ocrxml_filename),
                              "rb")
                     s3ocrxml = f.read()
@@ -1673,7 +1669,7 @@
                           )
         result = table.build()
         if result != None:
-            self.content += result 
+            self.content += result
 
 
     def addrHeader(self,
@@ -1701,7 +1697,7 @@
                               )
         result = rHeader.build()
         if result != None:
-            self.content += result 
+            self.content += result
 
     def addPlainTable(self, text, style=None, append=True):
         table = Table(text, style=style)
@@ -1793,7 +1789,7 @@
         tempDoc.pagesize = portrait(self.paper_size)
         tempDoc.build([tempTable], canvasmaker=canvas.Canvas)
         return (tempTable._colWidths, tempTable._rowHeights)
-        
+
     def cellStyle(self, style, cell):
         """
             Add special styles to the text in a cell
@@ -1803,7 +1799,7 @@
         elif style == "*RED":
             return [("TEXTCOLOR",cell, cell, colors.red)]
         return []
-        
+
 
     def addCellStyling(self, table, style):
         """
@@ -1826,7 +1822,7 @@
 
     def setHeaderBanner (self, image):
         """
-            This method will add a banner to a page, used by pageHeader 
+            This method will add a banner to a page, used by pageHeader
         """
         self.headerBanner = os.path.join(current.request.folder,image)
 
@@ -2199,7 +2195,7 @@
             self.paper_size = LETTER
         else:
             self.paper_size = A4
-        
+
         self.pdf = document
         self.resource = resource
         self.raw_data = raw_data
@@ -2477,7 +2473,7 @@
             startRow = endRow
         return pages
     # End of function splitTable()
-        
+
     def tableStyle(self, startRow, rowCnt, endCol):
         """
             Internally used method to assign a style to the table
@@ -3044,9 +3040,9 @@
 
             pageimagefile = row["image_file"]
             raw_images[eachpage] =\
-                Image.open(os.path.join("./applications/",
-                                        request.application,
-                                        "uploads/ocr_payload/",
+                Image.open(os.path.join(self.r.folder,
+                                        "uploads",
+                                        "ocr_payload",
                                         pageimagefile))
 
         # transform each image
@@ -3072,9 +3068,9 @@
                 self.__scaleFactor(images[each_img_index]["markers"])
 
         # get layout file, convert it to etree
-        layout_file = open(os.path.join("./applications/",
-                                       request.application,
-                                        "uploads/ocr_meta/",
+        layout_file = open(os.path.join(self.r.folder,
+                                        "uploads",
+                                        "ocr_meta",
                                         layoutfilename),
                            "rb")
         layout_xml = layout_file.read()