--- ImageArchive/ImageArchive.py	2004/11/11 19:46:37	1.32
+++ ImageArchive/ImageArchive.py	2004/11/12 10:59:26	1.33
@@ -167,7 +167,7 @@ class ImageCollection(Folder, Persistent
 
 
  
-    def createSet(self,RESPONSE=None):
+    def createSet(self,RESPONSE=None,local=None):
 	    """download aller gewaehlten files"""
 	    tempfile.tempdir="/tmp/archivesImageServer"
 	    
@@ -196,21 +196,32 @@ class ImageCollection(Folder, Persistent
 		    return 0
 	    
 	    for id in self.REQUEST.SESSION['filenames']:
-		    path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+urllib.quote(id[0])+"&mo=rawfile,hires"
 
-		    image=urllib.urlopen(path).read()
 		    if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(id[0]):
 			    filename=self.REQUEST.SESSION['filenamesIds'][id[0]][0]+"_"+id[0]
 		    else:
 			    filename=id[0]
 
-		    
-			    
-		    fh=file(tmpPath+"/"+filename,"w")
 		    if RESPONSE:
 			    RESPONSE.write(str("<p>Get File: %s<br>\n"%filename))
 
-		    fh.write(image)
+		    if local:
+			    sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+id[0]
+			    targetPath=tmpPath+"/"+filename
+			    shutil.copyfile(sourcePath,targetPath)
+			    
+		    else:
+			    
+			    path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+urllib.quote(id[0])+"&mo=rawfile,hires"
+
+			    image=urllib.urlopen(path).read()
+		    
+		    
+			    fh=file(tmpPath+"/"+filename,"w")
+
+		    
+			    fh.write(image)
+			    fh.close()
 
 		    #folgeseiten
 		    if int(self.REQUEST.SESSION['filenamesIds'][id[0]][1])>1: 
@@ -220,25 +231,27 @@ class ImageCollection(Folder, Persistent
 			    numberOfPages=self.REQUEST.SESSION['filenamesIds'][id[0]][1]
 			    for k in range(int(numberOfPages)-1):
 				    i=k+1
-
-				    path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"&/"+ids[nr+i]+"&mo=rawfile,hires"
-
-				    image=urllib.urlopen(path).read()
 				    if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(id[0]):
 					    filename=self.REQUEST.SESSION['filenamesIds'][id[0]][0]+"_"+ids[nr+i]
 				    else:
 					    filename=id[0]
 
-
-
-				    fh=file(tmpPath+"/"+filename,"w")
 				    if RESPONSE:
 					    RESPONSE.write(str("<p>Get File: %s<br>\n"%filename))
 
-				    fh.write(image)
+				    if local:
+					    sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+ids[nr+1]
+					    targetPath=tmpPath+"/"+filename
+					    shutil.copyfile(sourcePath,targetPath)
+				    else:
+					    path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+ids[nr+i]+"&mo=rawfile,hires"
 
+					    image=urllib.urlopen(path).read()
+				    
 
-		    fh.close()
+					    fh=file(tmpPath+"/"+filename,"w")
+					    fh.write(image)
+					    fh.close()
 
 	    if RESPONSE:
 		    RESPONSE.write("<h3>2. step: creating the downloadable file</h3>")