--- ImageArchive/ImageArchive.py	2006/05/17 21:42:49	1.88
+++ ImageArchive/ImageArchive.py	2006/05/22 13:54:37	1.89
@@ -390,11 +390,11 @@ class ImageDigilib(Folder,Persistent,Imp
             """hack"""
         #scale thumb
         
-        #self.scaleThumbs()
+        self.scaleThumbs()
 
         #scale standard
 
-        #self.scaleWorkingVersions()
+        self.scaleWorkingVersions()
 
         
         
@@ -480,11 +480,11 @@ class ImageDigilib(Folder,Persistent,Imp
             
             #scale thumb
         
-            #self.scaleThumbs()
+            self.scaleThumbs()
             
             #scale standard
 
-            #self.scaleWorkingVersions()
+            self.scaleWorkingVersions()
 
 
             if RESPONSE:
@@ -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()
@@ -532,14 +532,14 @@ class ImageDigilib(Folder,Persistent,Imp
                 pass
             #scale thumb
             
-            #self.scaleThumbs()
+            self.scaleThumbs()
                 
             #scale standard
     
-            #self.scaleWorkingVersions()
+            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")
@@ -1075,11 +1078,11 @@ class ImageCollection(OrderedFolder, Per
 
         #scale thumb
         
-        #self.scaleThumbs()
+        self.scaleThumbs()
 
         #scale standard
 
-        #self.scaleWorkingVersions()
+        self.scaleWorkingVersions()
         
 
         RESPONSE.redirect('manage_main')
@@ -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')
@@ -1163,7 +1166,7 @@ class ImageCollection(OrderedFolder, Per
 
                 #scale thumb
         
-        #self.scaleThumbs()
+        self.scaleThumbs()
 
         #scale standard
 
@@ -1789,11 +1792,11 @@ class ImageCollectionMD(ImageCollection,
                 #scale thumb
         
         
-        #self.scaleThumbs()
+        self.scaleThumbs()
 
         #scale standard
 
-        #self.scaleWorkingVersions()
+        self.scaleWorkingVersions()
         
         if RESPONSE:
                 RESPONSE.redirect('manage_main')
@@ -2084,20 +2087,20 @@ class ImageCollectionMD(ImageCollection,
                 return "ERROR: (%s %s) %s"%(sys.exc_info()[0],sys.exc_info()[1],xmldoc)
 
 
-        images=dom.xpath("//image")
+        imagenames=dom.xpath("//imagename")
         rc=[]
         fnIds={}
-        for image in images:
+        for imagename in imagenames:
 
-                imagename=image.xpath('./imagename')[0]
-              
+                #imagename=image.xpath('./imagename')[0]
+              	#print "im",imagename
                 
                 
                 
-                idnr=image.xpath('./idnr')[0]
+                idnr=imagename.xpath('../idnr')[0]
                 id=getText(idnr.childNodes)
                 try:
-                    numberOfPages=image.xpath('./numberOfPages')[0]
+                    numberOfPages=imagename.xpath('../numberOfPages')[0]
                 except:
                     numberOfPages=None
                     
@@ -2113,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)
@@ -2121,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