--- ImageArchive/ImageArchive.py	2006/05/16 10:28:08	1.81
+++ ImageArchive/ImageArchive.py	2006/05/22 13:54:37	1.89
@@ -1,7 +1,7 @@
 genericServerPath="http://www.mpiwg-berlin.mpg.de/zogilib_images" #can be changed with main config
 
 
-
+from Ft.Xml.Domlette import NonvalidatingReader
 from OFS.Folder import Folder
 from OFS.OrderedFolder import OrderedFolder
 from OFS.SimpleItem import SimpleItem
@@ -522,7 +522,7 @@ class ImageDigilib(Folder,Persistent,Imp
                 zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath))	
     
             #lesen des upload files und schreiben
-            filedata=file.read()
+            filedata=_fileupload.read()
             f=open(imagePath,"w") # if we wanted to have filename=id we should do it here!
             f.write(filedata)
             f.close()
@@ -539,7 +539,7 @@ class ImageDigilib(Folder,Persistent,Imp
             self.scaleWorkingVersions()
     
             if _rename:
-                self.renameImage(file.filename)
+                self.renameImage(_fileupload.filename)
         
      
         args=self.REQUEST.form
@@ -789,7 +789,7 @@ class ImageCollection(OrderedFolder, Per
         """scale thumbs"""
         
         #scale thumbs
-        ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath)
+        ret=os.popen("/docuserver/libs/scaleomat/scaleomat.pl -src=/docuserver/images/ -dir=%s -dest=/docuserver/scaled/thumb -scaleto=100 &"% self.ImageViewerPath)
         if RESPONSE:
                 RESPONSE.write(ret.read())
                 RESPONSE.write("\n")
@@ -801,7 +801,10 @@ class ImageCollection(OrderedFolder, Per
         
         #scale standard
 
-        ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/small -scaleto=2000 &"% self.ImageViewerPath)
+        ret=os.popen("/docuserver/libs/scaleomat/scaleomat.pl -src=/docuserver/images -dir=%s -dest=/docuserver/scaled/small -scaleto=1000 &"% self.ImageViewerPath)
+
+        ret=os.popen("/docuserver/libs/scaleomat/scaleomat.pl -src=/docuserver/images -dir=%s -dest=/docuserver/scaled/medium -scaleto=2000 &"% self.ImageViewerPath)
+
         if RESPONSE:
                 RESPONSE.write(ret.read())
                 RESPONSE.write("\n")
@@ -1129,11 +1132,11 @@ class ImageCollection(OrderedFolder, Per
 
                 #scale thumb
         
-        #self.scaleThumbs()
+        self.scaleThumbs()
 
         #scale standard
 
-        #self.scaleWorkingVersions()
+        self.scaleWorkingVersions()
         
         if RESPONSE:
                 RESPONSE.redirect('manage_main')
@@ -1631,7 +1634,7 @@ class ImageCollection(OrderedFolder, Per
 
     def getImageByName(self,filename,onlyName=None):
         """get filename"""
-        print repr(filename)
+        #print repr(filename)
         #FIXME: umlaute in filename
         fn=getattr(self,repr(filename),None)
         if not fn:
@@ -1754,6 +1757,49 @@ class ImageCollectionMD(ImageCollection,
     except:
         pass
     
+    
+    def ImportFiles(self,RESPONSE=None):
+        """Import the existing files of a folder"""
+        files=os.listdir(self.ImageStoragePath)
+        ret=""
+        #print self.__dict__
+        for file in files:
+            if not file[0]==".":
+                if self.__dict__.has_key(file):
+
+                    ret=ret+"<br>"+file+" already exists!"
+                else:
+                    ret=ret+"<br>"+file+" created!"
+                    newObj=ImageDigilib(file,file)
+                    #print newObj,file
+                    #print newObj
+                    try:
+                        self._setObject(file,newObj)
+                    except:
+                        """nothing yet"""
+                        
+                    
+                    args={}
+                    args['_table']=self.imageCollectionConfig.getTable()
+                    args[self.imageCollectionConfig.getKey()]=file
+                    
+                    if not self.ZSQLInlineSearch(args=args):
+                        self.ZSQLAdd(args=args)    
+        #print ret
+        #pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
+        #print self.ImageStoragePath
+
+                #scale thumb
+        
+        
+        self.scaleThumbs()
+
+        #scale standard
+
+        self.scaleWorkingVersions()
+        
+        if RESPONSE:
+                RESPONSE.redirect('manage_main')
   
     def addImage(self):
         """Add an Image"""
@@ -1827,15 +1873,38 @@ class ImageCollectionMD(ImageCollection,
 
     def searchDB(self,REQUEST=None,RESPONSE=None,xml=None):
         """search"""
-        #context.ZSQLFind(_table='vision_main')
-        urlTmp=REQUEST['URL1']
         
-        url=urlTmp+'/searchResultXML?-table=%s&'%self.imageCollectionConfig.getTable()+REQUEST['QUERY_STRING']
+        rc=[]
+        fnIds={}
+        for found in self.ZSQLInlineSearch(args=self.REQUEST.form):
+            key=getattr(found,self.imageCollectionConfig.getKey())
+            key=self.getImageByName(key,onlyName="yes")        
+            rc.append((key,'',0))
+            fnIds[key]=('',0)
+                
+        rc.sort()
+        self.REQUEST.SESSION['filenames']=rc
+        self.REQUEST.SESSION['filenamesIds']=fnIds
         
-        if xml is None:
-            RESPONSE.redirect('xmlinput?url='+urllib.quote(url))
+        overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html'])
+            
+        if overview:
+                return overview[0][1]()
         else:
-            RESPONSE.redirect(url)
+                pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
+                return pt()        
+        
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
+        return pt()        
+        
+        #urlTmp=REQUEST['URL1']
+        
+        #url=urlTmp+'/searchResultXML?-table=%s&'%self.imageCollectionConfig.getTable()+REQUEST['QUERY_STRING']
+        
+        #if xml is None:
+        #    RESPONSE.redirect('xmlinput?url='+urllib.quote(url))
+        #else:
+        #    RESPONSE.redirect(url)
             
     def index_html(self,fn=None,selection=None,generic='No',REQUEST=None,RESPONSE=None):
         """main template collection"""
@@ -1876,13 +1945,13 @@ class ImageCollectionMD(ImageCollection,
 
         self.REQUEST.SESSION['filename']=filen[0:]
         
-        if not self.REQUEST.SESSION['filename']=="":
-            url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')()
-            if mode=="view":
-                self.REQUEST.RESPONSE.redirect(url)
-            elif mode=="download":
-                self.REQUEST.RESPONSE.redirect(url+"/download")
-                
+#        if not self.REQUEST.SESSION['filename']=="":
+#            url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')()
+#            if mode=="view":
+#                self.REQUEST.RESPONSE.redirect(url)
+#            elif mode=="download":
+#                self.REQUEST.RESPONSE.redirect(url+"/download")
+#                
         if self.REQUEST.has_key('showall'):
 
             self.REQUEST.SESSION['showall']=self.REQUEST.get('showall')
@@ -1896,8 +1965,7 @@ class ImageCollectionMD(ImageCollection,
             
 
             if overview and (generic =='No'):#
-                print "selected"
-                print repr(overview[0][1])
+              
                 return overview[0][1]()
             else:
                 pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
@@ -2013,24 +2081,26 @@ class ImageCollectionMD(ImageCollection,
         xmldoc=urllib.urlopen(url).read()
         #return xmldoc
         try:
-                dom=xml.dom.minidom.parseString(xmldoc)
+                dom=NonvalidatingReader.parseUri(url)
+
         except:
                 return "ERROR: (%s %s) %s"%(sys.exc_info()[0],sys.exc_info()[1],xmldoc)
 
-        images=dom.getElementsByTagName('image')
 
+        imagenames=dom.xpath("//imagename")
         rc=[]
         fnIds={}
-        for image in images:
-                imagename=image.getElementsByTagName('imagename')[0]
-              
+        for imagename in imagenames:
+
+                #imagename=image.xpath('./imagename')[0]
+              	#print "im",imagename
                 
                 
                 
-                idnr=image.getElementsByTagName('idnr')[0]
+                idnr=imagename.xpath('../idnr')[0]
                 id=getText(idnr.childNodes)
                 try:
-                    numberOfPages=image.getElementsByTagName('numberOfPages')[0]
+                    numberOfPages=imagename.xpath('../numberOfPages')[0]
                 except:
                     numberOfPages=None
                     
@@ -2046,7 +2116,9 @@ class ImageCollectionMD(ImageCollection,
                 texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste
                 for text in texts:
                     if not text=="":
+			#print "a"
                         text=self.getImageByName(text,onlyName="yes")
+			#print "b"
                         try:
                                 rc.append((str(text),id,nop))
                                 fnIds[str(text)]=(id,nop)
@@ -2054,7 +2126,7 @@ class ImageCollectionMD(ImageCollection,
                                 rc.append((repr(text),id,nop))
                                 fnIds[repr(text)]=(id,nop)
                 
-
+        #print "done"
         rc.sort()
         self.REQUEST.SESSION['filenames']=rc
         self.REQUEST.SESSION['filenamesIds']=fnIds