--- OSAS/OSA_system/OSAS_show.py 2004/04/15 20:48:01 1.20 +++ OSAS/OSA_system/OSAS_show.py 2005/01/21 15:54:28 1.29 @@ -54,7 +54,8 @@ class OSAS_ShowOnline(SimpleItem): return hasMetafile(path) def getMetafile(self,path): - return getMetafile(path) + + return getMetafile(path).decode('utf-8') def toggle_view(self,path,file): """Oeffnen bzw. schließen der Subfolders""" @@ -106,7 +107,9 @@ class OSAS_StoreOnline(SimpleItem): def rescaleThumbs(self,path): """rescale thumbs of images in path""" - os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/thumb 90 --replace >> /tmp/sc.out &"% re.sub('/mpiwg/online/','',self.REQUEST['path'])) + dlpath = re.sub('/mpiwg/online/','',self.REQUEST['path']) + os.popen("ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat -src=/mpiwg/online -dest=/mpiwg/temp/online/scaled/thumb -dir=%s -scaleto=90 -sync >> /tmp/sc.out &"%dlpath ) + #os.popen("ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/thumb 90 --replace >> /tmp/sc.out &"% re.sub('/mpiwg/online/','',self.REQUEST['path'])) self.REQUEST.SESSION['path']=self.REQUEST['path'] #return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']) @@ -140,7 +143,8 @@ class OSAS_StoreOnline(SimpleItem): return hasMetafile(path) def getMetafile(self,path): - return getMetafile(path) + + return getMetafile(path).decode('utf-8') def toggle_view(self,path,file): """Oeffnen bzw. schließen der Subfolders""" @@ -159,6 +163,11 @@ class OSAS_StoreOnline(SimpleItem): """Test ob Eintrag ein Folder ist""" return isFullText(path,folder_name) + def isPdf(self,path,folder_name): + """Test ob Eintrag ein Folder mit pdf2 ist""" + return isPdf(path,folder_name) + + def isPresentation(self,path,folder_name): """Test ob Eintrag ein Folder ist""" return isPresentation(path,folder_name) @@ -193,7 +202,7 @@ class OSAS_StoreOnline(SimpleItem): """Editiere das Index Metafile""" try: dom=xml.dom.minidom.parse(path+"/index.meta") - indexmeta=dom.toxml() + indexmeta=dom.toxml(encoding='UTF-8') except: indexmeta="" @@ -230,25 +239,30 @@ class OSAS_StoreOnline(SimpleItem): dom=xml.dom.minidom.parse(path+"/index.meta") node=dom.getElementsByTagName('texttool')[0] #getNode subnode=node.getElementsByTagName(name)[0] - - return getText(subnode.childNodes) + + # bei text wird nur der Folder gebraucht + if name=="text": + splitted=getText(subnode.childNodes).split("/") + return splitted[len(splitted)-2] + else: + return getText(subnode.childNodes) except: return default - def getProjects(self,obj_ids=None): - """Get the Project title for configuration""" + def getViewerTemplateSets(self,obj_ids=None): + """Get the ViewerTemplateSet title for configuration""" ret=[] try: - projects=self.ZopeFind(self.projects,obj_metatypes=['OSAS_project'],obj_ids=obj_ids)#assumes projects folder somewhere in the hierarchie. + viewerTemplateSets=self.ZopeFind(self.viewerTemplateSets,obj_metatypes=['OSAS_viewerTemplateSet'],obj_ids=obj_ids)#assumes viewerTemplateSets folder somewhere in the hierarchie. - for project in projects: - ret.append((project[1].title,project[0],project[1])) + for viewerTemplateSet in viewerTemplateSets: + ret.append((viewerTemplateSet[1].title,viewerTemplateSet[0],viewerTemplateSet[1])) return ret except: - return [('no Projectfolders','')] + return [('no ViewerTemplateSetfolders','')] def changeTemplatesForm(self,path): """changeform""" @@ -258,14 +272,12 @@ class OSAS_StoreOnline(SimpleItem): - def changeTemplates(self,path): + def changeTemplates(self,path,RESPONSE=None): """Andere alle Eintraege in index.meta""" - #os.path.walk(path,OSAS_helpers.changeIndexMeta,startpage,xslt,thumbtemplate,topbar,digiLibTemplate) - print self.REQUEST.form - - os.path.walk(path,OSAS_helpers.changeIndexMeta,self.REQUEST.form) - + if RESPONSE is not None: + RESPONSE.redirect(self.REQUEST['URL1']+"?path="+self.REQUEST.SESSION['path']) + InitializeClass(OSAS_StoreOnline) @@ -953,7 +965,9 @@ def getBib(nodelist): if node.nodeType == node.ELEMENT_NODE: """nothing""" + rc = rc+""+str(node.nodeName)+": "+getText(node.childNodes)+"" + #print rc return rc+"" @@ -1012,7 +1026,7 @@ def getMetafile(path): # html=html.encode('utf-8','replace')+getBib(bib.childNodes).encode('utf-8','replace') - return html + return html.encode('utf-8') def hasMetafile(path): """get index.meta""" @@ -1070,6 +1084,20 @@ def isFullText(path,folder_name): return 0 +def isPdf(path,folder_name): + """check if foldername in path is full text""" + try: + dom=xml.dom.minidom.parse(path+"/index.meta") + for node in dom.getElementsByTagName("dir"): + + if getText(node.getElementsByTagName("content-type")[0].childNodes).lower()=="pdf": + + if getText(node.getElementsByTagName("name")[0].childNodes)==folder_name: + return 1 + return 0 + except: + + return 0 def isPresentation(path,folder_name): """check if foldername in path is full text"""