--- /sjr/beodata/tmp/software/Gallery2-1.3.5-6.py	2005-08-10 12:30:55.000000000 -0400
+++ Gallery2.py	2005-08-10 12:27:32.000000000 -0400
@@ -329,6 +338,7 @@
         self.kw['thumbnail_width']='128'
         self.kw['webnail_width']='640'
         self.kw['text_width']='140'
+        self.kw['pull_from_dir']=None
 
        
 
@@ -349,7 +359,12 @@
 
         current_pagename=formatter.page.page_name
 
-        attachment_path = AttachFile.getAttachDir(self.request,current_pagename,create=1)
+        if kw['pull_from_dir']:
+            attachment_path = kw['pull_from_dir']
+        else:
+            attachment_path = AttachFile.getAttachDir(self.request,current_pagename,create=1)
+
+        out_path = AttachFile.getAttachDir(self.request,current_pagename,create=1)
  
         if (kw['help'] == '1'):
 
@@ -505,8 +520,8 @@
                                'date'    : 'alias'
                             })
 
-                        thumb=os.path.join(attachment_path,thumbfile)
-                        webf=os.path.join(attachment_path,webnail)
+                        thumb=os.path.join(out_path,thumbfile)
+                        webf=os.path.join(out_path,webnail)
 
                         if (kw['renew'] == '1'):
                            if os.path.exists(thumb):