--- cdli/cdli_files.py	2009/06/24 11:13:47	1.112
+++ cdli/cdli_files.py	2010/03/19 14:01:41	1.115
@@ -90,7 +90,7 @@ class CDLIFileObject(CatalogAware,extVer
     def getPNumber(self):
         """get the pnumber"""
         try:
-                txt=re.match("&[Pp](\d*)\s*=([^\r\n]*)",self.getData()[0:])
+                txt=re.match("&[PpSs](\d*)\s*=([^\r\n]*)",self.getData()[0:])
         except:
                 txt=self.getData()[0:]
                 
@@ -104,7 +104,7 @@ class CDLIFileObject(CatalogAware,extVer
     def getDesignation(self):
         """get the designation out of the file"""
         try:
-                txt=re.match("&[Pp](\d*)\s*=([^\r\n]*)",self.getData()[0:])
+                txt=re.match("&[PpSs](\d*)\s*=([^\r\n]*)",self.getData()[0:])
         except:
                 txt=self.getData()[0:]
                 
@@ -318,8 +318,8 @@ def checkFile(filename,data,folder):
     # first check the file name
     fn=filename.split(".") # no extension
 
-    if not fn[0][0]=="P":
-        return False,"P missing in the filename"
+    if not (fn[0][0]=="P" or fn[0][0]=="S"):
+        return False,"P/S missing in the filename"
     elif len(fn[0])!=7:
         return False,"P number has not the right length 6"
     elif not checkUTF8(data):
@@ -801,13 +801,34 @@ class CDLIRoot(Folder):
         if isinstance(fileId,CDLIFileObject): # support for old baskets
 		          return fileId
         x=self.v_files.get(fileId)
-        
+        logging.debug("obj: "+repr(x))
+        if x==None:
+            folder=fileId[0:3]
+            f2=fileId[0:5]
+            fObj = getattr(self.cdliRoot.cdli_main,folder);
+            f2Obj = getattr(fObj,f2)
+            
+            o = getattr(f2Obj,fileId)
+            logging.debug(o);
+            self.updateOrAddToFileBTree(o)
+            return o
         return x
     
     def getFileObjectLastVersion(self,fileId):
         """get an object"""
         x=self.v_files_lastVersion.get(fileId)
-        #logging.debug("lastVersion: "+repr(x))
+        logging.debug("lastVersion: "+repr(x))
+        if x==None:
+            folder=fileId[0:3]
+            f2=fileId[0:5]
+            fObj = getattr(self.cdliRoot.cdli_main,folder);
+            f2Obj = getattr(fObj,f2)
+
+            o =getattr(f2Obj,fileId)
+            logging.debug(o);
+            return o.getLastVersion()
+        
+
         return x
     
     def showFileIds(self):
@@ -836,8 +857,17 @@ class CDLIRoot(Folder):
         self.v_files_lastVersion.update({obj.getId():obj.getLastVersion()})
         
         self.v_file_ids.add(obj.getId())
-        logging.debug("update:"+obj.getId()+"XXX"+repr(obj))
+        #change everthing around to make it persistent...
+        tmp = self.v_files
+        self.v_files=tmp
         
+        tmp2=self.v_file_ids
+        self.v_file_ids=tmp2
+
+        self.CDLICache.cleanCache() #be sure that the cache is clean
+        logging.debug("update:"+obj.getId()+"XXX"+repr(obj))
+
+
     def deleteFromBTree(self,objId):
         """delete an obj"""
         self.v_files.pop(objId)
@@ -970,7 +1000,7 @@ class CDLIRoot(Folder):
             if line.lstrip().startswith('#lem:'):
                 continue
             # ignore p-num line
-            if line.startswith('&P'):
+            if line.startswith('&P') or line.startswith('&S'):
                 continue
             # ignore version lines
             if line.startswith('#version'):
@@ -1061,9 +1091,6 @@ class CDLIRoot(Folder):
                 lv.author=user
                 lv.versionComment="XXXXXXX"
     
-            
-        
-        gen
     def forceunlock(self,REQUEST=None,user=None,fid=None):
         "break all locks"
         if fid is not None:
@@ -1287,9 +1314,6 @@ class CDLIRoot(Folder):
                  
     def uploadATFfinally(self,procedure='',comment="",basketname='',unlock=None,repeat=None,RESPONSE=None):
         """nowupload the files"""
-       
-       
-       
         threadName=repeat
         if not threadName or threadName=="":
             thread=uploadATFfinallyThread()
@@ -1349,7 +1373,11 @@ class CDLIRoot(Folder):
                     try:
                         self.cdliRoot.updateOrAddToFileBTree(ob[0].getObject())
                     except:
+               
                         logging.error("uploadATFfinally - cannot update Object %s Error: %s %s"%(ob[1],sys.exc_info()[0],sys.exc_info()[1]))
+              for x in stObj.returnValue['newPs']:
+                  obj=self.getFileObject(x) #updates the object in the cache
+                  logging.debug("Got:"+repr(obj))
               if RESPONSE is not None:
                   RESPONSE.redirect(self.absolute_url())
 
@@ -1396,17 +1424,21 @@ class CDLIRoot(Folder):
             id=f
             logging.debug("importFiles: addCDLIFile fobj2=%s, f=%s file2=%s"%(fobj2,repr(f),repr(file2)))
             fobj2.addFile(vC='',file=file(file2),author=author,newName=f)
+            logging.debug("importfiles: fobj2.add")
             count+=1
             
             #now add the file to the storage
             ob = getattr(fobj2,f)
-            self.cdliRoot.updateOrAddToFileBTree(ob)
-            
+            logging.debug("importfiles: btree_start")
+            #self.cdliRoot.updateOrAddToFileBTree(ob)
+            logging.debug("importfiles: btree_end")
             if count%100==0:
                 logging.debug("importfiles: committing")
                 transaction.get().commit()
 
+        logging.debug("importfiles: committing")
         transaction.get().commit()
+        logging.debug("importfiles: committing done")
         return "ok"