--- OSAS/OSA_system/OSAS_addfiles.py 2005/04/27 13:17:45 1.40 +++ OSAS/OSA_system/OSAS_addfiles.py 2008/10/17 06:26:43 1.52 @@ -19,6 +19,15 @@ from Globals import package_home from xml.sax import make_parser from xml.sax.handler import ContentHandler +import sys +import logging +import xmlrpclib +#ersetzt logging +def logger(txt,method,txt2): + """logging""" + logging.info(txt+ txt2) + + def spaces(depth): """needed in XMLtoTree""" @@ -76,7 +85,7 @@ class OSAS_add_Document(Folder): def add4(self): """Applet""" - + return OSAS_add.add4(self) def add5(self): @@ -93,33 +102,33 @@ class OSAS_add_Document(Folder): metadata['archive-creation-date']=OSAS_add.date(self) metadata['creator']=self.REQUEST['creator'] metadata['description']=self.REQUEST['content_description'] - metadata['archive-path']=os.path.split(self.REQUEST.SESSION['pathnew'])[0] - #metadata['folder_name']=self.REQUEST.SESSION['folder_name'] - metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[1] - metadata['content-type']="fulltext document" - self.reftype=self.REQUEST.SESSION['reftype'] - self.REQUEST.SESSION['add_metadata']=metadata - self.add_metadata=metadata - self.metadata=self.REQUEST.SESSION['metadata'] - self.metadataprint="" - for tag in self.metadata.keys(): + metadata['archive-path']=os.path.split(self.REQUEST.SESSION['pathnew'])[0] + #metadata['folder_name']=self.REQUEST.SESSION['folder_name'] + metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[1] + metadata['content-type']="fulltext document" + self.reftype=self.REQUEST.SESSION['reftype'] + self.REQUEST.SESSION['add_metadata']=metadata + self.add_metadata=metadata + self.metadata=self.REQUEST.SESSION['metadata'] + self.metadataprint="" + for tag in self.metadata.keys(): #print str(self.metadata[tag]).decode('utf-8').encode('utf-8') self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"\n" - newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','index_meta')).__of__(self) - newtemplate.content_type="text/plain" - renderxml = newtemplate(encoding='utf-8') + newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','index_meta')).__of__(self) + newtemplate.content_type="text/plain" + renderxml = newtemplate(encoding='utf-8') #return renderxml metapath=self.REQUEST.SESSION['pathnew']+"/index.meta" - - f=open(metapath,'w') + + f=open(metapath,'w') - f.write(renderxml) - f.close() - os.chmod(metapath,0664) - os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']) - + f.write(renderxml) + f.close() + os.chmod(metapath,0664) + os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']) + return OSAS_add.addText2(self) def addPdf2(self): @@ -128,30 +137,30 @@ class OSAS_add_Document(Folder): metadata['archive-creation-date']=OSAS_add.date(self) metadata['creator']=self.REQUEST['creator'] metadata['description']=self.REQUEST['content_description'] - metadata['archive-path']=os.path.split(self.REQUEST.SESSION['pathnew'])[0] - #metadata['folder_name']=self.REQUEST.SESSION['folder_name'] - metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[1] - metadata['content-type']="fulltext document" - self.reftype=self.REQUEST.SESSION['reftype'] - self.REQUEST.SESSION['add_metadata']=metadata - self.add_metadata=metadata - self.metadata=self.REQUEST.SESSION['metadata'] - self.metadataprint="" - for tag in self.metadata.keys(): - self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"\n" - - newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','index_meta')).__of__(self) - newtemplate.content_type="text/plain" - renderxml = newtemplate(encoding='utf-8') + metadata['archive-path']=os.path.split(self.REQUEST.SESSION['pathnew'])[0] + #metadata['folder_name']=self.REQUEST.SESSION['folder_name'] + metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[1] + metadata['content-type']="fulltext document" + self.reftype=self.REQUEST.SESSION['reftype'] + self.REQUEST.SESSION['add_metadata']=metadata + self.add_metadata=metadata + self.metadata=self.REQUEST.SESSION['metadata'] + self.metadataprint="" + for tag in self.metadata.keys(): + self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"\n" + + newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','index_meta')).__of__(self) + newtemplate.content_type="text/plain" + renderxml = newtemplate(encoding='utf-8') metapath=self.REQUEST.SESSION['pathnew']+"/index.meta" - - - f=open(metapath,'w') - f.write(renderxml) - f.close() - os.chmod(metapath,0664) - os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']) - + + + f=open(metapath,'w') + f.write(renderxml) + f.close() + os.chmod(metapath,0664) + os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']) + return OSAS_add.addPdf2(self) def addImages(self,path): @@ -289,9 +298,9 @@ class OSAS_add_contextData(Folder): return curHandler.retStr except: - return URL + return URL return urllib.urlopen(URL).read() - + def __init__(self,id,collection): self.id=id @@ -312,27 +321,39 @@ class OSAS_add_contextData(Folder): URL+="/getPartnersXML" - parser=make_parser() - curHandler=requestHandler() + parser=make_parser() + curHandler=requestHandler() parser.setContentHandler(curHandler) - parser.parse(urllib.urlopen(URL)) - try: + parser.parse(urllib.urlopen(URL)) + try: - return curHandler.ret + return curHandler.ret except: - return [("",URL)] - + return [("",URL)] + def addContextData(self,path): """Hinzufuegen zu einer Sammlung""" + + server=getattr(self,'serverUrl',self.REQUEST['SERVER_URL']) + if path[0]=="/": #strip leading slash + urlpath=path[1:] + else: + urlpath=path try: - urllib.urlopen(self.REQUEST['SERVER_URL']+path+"/index.meta") + urllib.urlopen(server+"/"+urlpath+"/index.meta") except: - return self.REQUEST['SERVER_URL']+path+"/index.meta file has to exist!" + logger("OSAS_addfiles (addContextData)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2]) + return server+"/"+urlpath+"/index.meta file has to exist!" - links=[(path,'standard storage')] - + # old version for foxridge storage viewer + #links=[(path,'storage server view')] + # libcoll viewer with imagepath: needs pageimg directory + links=[('http://libcoll.mpiwg-berlin.mpg.de/libview?mode=imagepath&url=%s/pageimg'%path,'libcoll standard viewer (pageimg)')] + # libcoll viewer with texttool: needs texttool tag + links+=[('http://libcoll.mpiwg-berlin.mpg.de/libview?mode=texttool&url=%s/index.meta'%path,'libcoll standard viewer (texttool)')] + links+=OSAS_show.readContexts(path) # auslesen von contexten fuer den link #print "LINK",links #return links @@ -347,31 +368,53 @@ class OSAS_add_contextData(Folder): #print "BLU" id=splitted[len(splitted)-1] title=splitted[len(splitted)-1] - metalink=self.REQUEST['SERVER_URL']+path+"/index.meta" + server=getattr(self,'serverUrl',self.REQUEST['SERVER_URL']) + if path[0]=="/": #strip leading slash + urlpath=path[1:] + else: + urlpath=path + + + metalink=server+"/"+urlpath+"/index.meta" #link=TOBEDONE" """Hinzufuegen der Ressource""" params=urllib.urlencode({'id':id,'title':title,'link':link,'label':label,'description':description,'contentType':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink}) - + server=xmlrpclib.ServerProxy(collection,allow_none=True) try: - retStr=urllib.urlopen(collection+"/addResource",params).read() + #retStr=urllib.urlopen(collection+"/addResource",params).read() + + retStr=server.addResource(id,title,label,description,content_type,responsible,link,metalink,weight,credits) + except: - return "An Error occured adding the resource\n", collection,params + return "An Error occured adding the resource A\n", collection,params,str(sys.exc_info()[0]),str(sys.exc_info()[1]) + + #print "added" + logging.debug("Add an resource:"+repr(retStr)) + if not retStr: + return "An Error occured adding the resource B\n", collection,params - #print "added" - if not retStr: - return "An Error occured adding the resource\n", collection,params - #print collection+"/"+id+"/copyIndex_meta2echo_resource" + #TODO: fehler falls generate label oder title nicht funktioniert abfangen, bei ECHO geht das z.B. manchmal nicht. + #server=xmlrpclib.ServerProxy(collection+"/"+id,allow_none=True) + #server2=getattr(server,id) + #server2.copyIndex_meta2echo_resource() + #urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read() + #print "copy2res" + #try: + #urllib.urlopen(collection+"/"+id+"/generate_label").read() + # server2.generate_label() + # except: + # logger("OSAS_addfiles (addContextData2,label not generated)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2]) + #try: + #urllib.urlopen(collection+"/"+id+"/generate_title").read() + # server2.generate_title() + #except: + # logger("OSAS_addfiles (addContextData2,title not generated)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2]) + - urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read() - #print "copy2res" - urllib.urlopen(collection+"/"+id+"/generate_label").read() - #print "label" - urllib.urlopen(collection+"/"+id+"/generate_title").read() - #print "title" return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path) manage_options = Folder.manage_options+( @@ -385,10 +428,11 @@ class OSAS_add_contextData(Folder): return pt() - def change_OSAS_add_contextData(self,collection,pwstr=None,RESPONSE=None): + def change_OSAS_add_contextData(self,collection,serverUrl,pwstr=None,RESPONSE=None): """Change""" self.pwstr=pwstr self.collection=collection + self.serverUrl=serverUrl if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -492,47 +536,47 @@ class OSAS_combineTextImage(Folder): def combineTextImage(self,path): """Hinzufügen der Presenationsinformation""" """gibt input formular zur erstellung des texttools meta tag aus""" - files = os.listdir(path) - - texts=[] - imagefolders=[] - presentationfolders=[] - - splitted=path.split("/") - externxml=readArchimedesXML(splitted[len(splitted)-1]) - - for filename in files: - #print "FN",filename - if archive.isdigilib2(path+"/"+filename): - imagefolders.append(filename) - - if archive.isFullText(path,filename): - #print "HI" - texts.append(filename) - if archive.isPresentation(path,filename): - presentationfolders.append(filename) - - dom=xml.dom.minidom.parse(path+"/index.meta") - try: - filelanguage=archive.getText(dom.getElementsByTagName('lang')[0].childNodes) - except: - filelanguage="" + files = os.listdir(path) + + texts=[] + imagefolders=[] + presentationfolders=[] + + splitted=path.split("/") + externxml=readArchimedesXML(splitted[len(splitted)-1]) + + for filename in files: + #print "FN",filename + if archive.isdigilib2(path+"/"+filename): + imagefolders.append(filename) + + if archive.isFullText(path,filename): + #print "HI" + texts.append(filename) + if archive.isPresentation(path,filename): + presentationfolders.append(filename) + + dom=xml.dom.minidom.parse(path+"/index.meta") + try: + filelanguage=archive.getText(dom.getElementsByTagName('lang')[0].childNodes) + except: + filelanguage="" - self.REQUEST.SESSION['isolist']=OSAS_add.getISO() + self.REQUEST.SESSION['isolist']=OSAS_add.getISO() + + tmp=self.REQUEST.SESSION['isolist'].keys() + tmp.sort() + self.REQUEST.SESSION['isolistsort']=tmp + self.REQUEST.SESSION['path']=path + self.REQUEST.SESSION['texts']=texts + self.REQUEST.SESSION['imagefolders']=imagefolders + self.REQUEST.SESSION['presentationfolders']=presentationfolders + self.REQUEST.SESSION['filelanguage']=filelanguage + self.REQUEST.SESSION['externxml']=externxml + + newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ImageandText')).__of__(self) + return newtemplate() - tmp=self.REQUEST.SESSION['isolist'].keys() - tmp.sort() - self.REQUEST.SESSION['isolistsort']=tmp - self.REQUEST.SESSION['path']=path - self.REQUEST.SESSION['texts']=texts - self.REQUEST.SESSION['imagefolders']=imagefolders - self.REQUEST.SESSION['presentationfolders']=presentationfolders - self.REQUEST.SESSION['filelanguage']=filelanguage - self.REQUEST.SESSION['externxml']=externxml - - newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ImageandText')).__of__(self) - return newtemplate() - def getViewerTemplateSets(self,obj_ids=None): """Get the ViewerTemplateSet title for configuration""" ret=[] @@ -569,9 +613,9 @@ class OSAS_combineTextImage(Folder): def combineTextImage2(self,path): """Eingabe von Metadateninformationen""" - - # correct path - path=re.sub("//","/",path) + + # correct path + path=re.sub("//","/",path) OSAS_add.combineTextImage2(self,path) # Add images splitted=path.split("/") linkPath=splitted[len(splitted)-1]