Changeset 3325

Timestamp:

12 Mar 2008, 14:06:44 (17 years ago)

Author:

joachim

Message:

pending and errors can be downloaded,
line_nr of wrong record added

Location:

WAeUP_SRP/base

Files:

• Upload.py (modified) (4 diffs)
• WAeUPImport.py (modified) (4 diffs)
• WAeUPTool.py (modified) (4 diffs)
• skins/waeup_upload/download_errors.py (added)
• skins/waeup_upload/download_pending.py (added)
• skins/waeup_upload/uploads_form.pt (modified) (2 diffs)
• skins/waeup_upload/uploads_index.py (modified) (1 diff)

WAeUP_SRP/base/Upload.py

@@ -56 +56 @@
     NO_KEY = NO_KEY
     IGNORE = IGNORE
+    def getImporter(self):
+        importer_name = ''.join([part.capitalize() for part in self.getContent().import_layout.split('_')])
+        importer = eval("%sImport" % importer_name)(self)
+        return importer
+    
     security.declareProtected(View,"Title") ###(
     def Title(self):
@@ -67 +72 @@
         doc = self.getContent()
         csv_path = os.path.join(storage_path,doc.filename)
-        importer_name = ''.join([part.capitalize() for part in self.getContent().import_layout.split('_')])
-        importer = eval("%sImport" % importer_name)(self)
+        importer = self.getImporter()
         msg = ''
         invalid_keys = []
@@ -99 +103 @@
     def getKeys(self):
         """return the valid keys for headline"""
-        importer_name = ''.join([part.capitalize() for part in self.getContent().import_layout.split('_')])
-        importer = eval("%sImport" % importer_name)(self)
+        importer = self.getImporter()
         keys = importer.schema.keys()
         keys.sort()
@@ -113 +116 @@
     ###)
 
+    security.declareProtected(ModifyPortalContent,"getPending") ###(
+    def getPending(self):
+        """return pending-data"""
+        importer = self.getImporter()
+        data = open(importer.pending_path).read()
+        return importer.pending_fn,data
+
+    security.declareProtected(ModifyPortalContent,"getPending") ###(
+    def getErrors(self):
+        """return import_errors"""
+        import tempfile
+        importer = self.getImporter()
+        lines = []
+        filename = self.getContent().filename
+        data = open(importer.pending_path)
+        reader = csv.reader(data)
+        headline = reader.next()
+        reader = csv.DictReader(data,headline)
+        # imported_from_pos = headline.index('imported_from')
+        # imported_line_nr_pos = headline.index('imported_line_nr')
+        out_file = tempfile.TemporaryFile()
+        writer = csv.DictWriter(out_file,
+                                importer.info.keys(),
+                                extrasaction='ignore')
+        lines += dict([(k,k) for k in importer.info.keys()]),
+        #import pdb;pdb.set_trace()
+        for item in reader:
+            if item["imported_from"] == filename:
+                lines += item,
+        writer.writerows(lines)
+        out_file.seek(0)
+        return out_file.read()
+
     security.declareProtected(ModifyPortalContent,"editHeadline") ###(
     def editHeadline(self,key_pairs):
         """edit headline"""
-        importer_name = ''.join([part.capitalize() for part in self.getContent().import_layout.split('_')])
-        importer = eval("%sImport" % importer_name)(self)
         csv_path = os.path.join(storage_path,self.filename)
         reader = csv.reader(open(csv_path,"rb"))

WAeUP_SRP/base/WAeUPImport.py

@@ -103 +103 @@
             info = {}
             info['imported_from'] = ''
-            info['imported_by'] =  self.imported_by
+            info['import_line_nr'] = 0
+            info['imported_by'] = self.imported_by
             info['import_date'] = self.import_date.strftime("%d/%m/%y %H:%M:%S")
             info['error'] = ''
@@ -128 +129 @@
         if os.path.exists(self.pending_path):
             datafile = open(self.pending_path,"r")
-            pending_csv_reader = csv.DictReader(datafile,self.csv_keys,)
-            pending_csv_reader.next() # skip headline
+            reader = csv.reader(datafile)
+            old_headline = reader.next()
+            #datafile.seek(0)
+            pending_csv_reader = csv.DictReader(datafile,old_headline,)
+            #pending_csv_reader.next() # skip headline
             for item in pending_csv_reader:
                 digest = makeDigest(item,self.data_keys)
@@ -169 +173 @@
         while True:
             if len(values) != len(import_keys):
-                msg += "+ %d fields in headline but %d values +" % (len(import_keys),len(values))
+                msg += "%d fields in headline but %d values" % (len(import_keys),len(values))
                 break
             for k in import_keys:
                 if k in singels:
                     keys += (k,'%s' % k,values[i],'(duplicate)'),
-                    msg += ("+ duplicate %s +" % k)
+                    msg += ("duplicate %s," % k)
                     keys[singels.index(k)] = (k,'%s' % k,values[singels.index(k)],'(duplicate)')
                 elif k in invalid_keys and not k.startswith(IGNORE):
@@ -186 +190 @@
     ###)
 ###)
-
 
 class ApplicationImport(WAeUPImport):###(

WAeUP_SRP/base/WAeUPTool.py

@@ -936 +936 @@
         da['jamb_sex'] = sex
         da['jamb_age'] = brain.jamb_age
-        da['app_reg_pin'] = brain.pin
+        #da['app_ac_pin'] = brain.pin
         da['jamb_lga'] = brain.jamb_lga
         da['jamb_state'] = brain.jamb_state
@@ -1412 +1412 @@
         #current = importer.current
         import_date = importer.import_date
-        imported_by = importer.imported_by
         #
         # not_imported
@@ -1565 +1564 @@
             data_string = ", ".join("%s: %s" % (k,v) for k,v in mapping.items())
             info['error'] = error
+            info['import_line_nr'] = count + 1
             mapping.update(info)
             log_list = []
@@ -1639 +1639 @@
                 #mapping['import_date'] = DateTime.DateTime()
                 mapping['import_date'] = import_date
-                mapping['imported_by'] = imported_by
+                mapping['imported_by'] = member
                 mapping['import_message'] = msg
                 upload_doc.edit(mapping = mapping)

WAeUP_SRP/base/skins/waeup_upload/uploads_form.pt

@@ -180 +180 @@
           <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">      
             <tr>
+              <th>Download</th>
               <th>File in Archive</th>
               <th>Data Layout</th>
@@ -190 +191 @@
             <tr tal:repeat="row info/imported"
                 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
-              <td tal:condition="nothing"> <a href="view" tal:attributes="href string:${row/url}"> <span tal:content="row/id" /></a>  </td>
+              <td> <a href="view" tal:attributes="href string:${row/url}/download_pending">pending</a> <br />
+                              <a href="view" tal:attributes="href string:${row/url}/download_errors">errors</a>  </td>
               <td tal:content="string:${row/id}.done" ></td>
               <td tal:content="row/import_layout"></td>

WAeUP_SRP/base/skins/waeup_upload/uploads_index.py

@@ -87 +87 @@
         row['msg'] = import_message
         if getattr(doc,'import_date',''):
-            row['import_date'] = doc.import_date.strftime("%d/%m/%y %H:%M:%S")
+            row['import_date'] = doc.import_date
         else:
             row['import_date'] = ''
         add_to = imported
+        
     else:
         row['msg'],row['fields'] = doc['checkKeys']()