version 1.286, 2007/03/09 17:57:13
|
version 1.289, 2007/07/19 11:02:28
|
Line 1177 class ECHO_resource(CatalogAware,Folder,
|
Line 1177 class ECHO_resource(CatalogAware,Folder,
|
only if metalink is set, otherwise it gives false |
only if metalink is set, otherwise it gives false |
""" |
""" |
|
|
|
texterUrl="http://nausikaa2.mpiwg-berlin.mpg.de/digitallibrary/servlet/Texter?fn=/" |
|
|
|
vl,msg=self.checkValidityOfMetaLink() |
|
|
|
if not vl: #ungueltiger link, versuche neuen |
|
newStr=re.match(".*/mpiwg/online/(.*)",self.metalink) # suche pfad hinter /mpiwg/online |
|
oldLink=self.metalink |
|
|
|
if newStr: |
|
self.metalink=texterUrl+newStr.group(1) |
vl,msg=self.checkValidityOfMetaLink() |
vl,msg=self.checkValidityOfMetaLink() |
|
else: |
|
logging.error("change Viewer XX(mew Metadatafile) %s"%self.metalink) |
|
vl=False |
|
|
|
if not vl: # geht immer noch nicht, dann setzte wieder zurueck |
|
self.metaLink=oldLink |
|
|
|
logging.info("change Viewer (mew Metadatafile) %s"%self.metalink) |
|
|
if vl: |
if vl: |
self.newViewer=newViewer |
self.newViewer=newViewer |
Line 2146 class ECHO_collection(CatalogAware, Fold
|
Line 2164 class ECHO_collection(CatalogAware, Fold
|
|
|
if obj.meta_type=="ECHO_mapText": |
if obj.meta_type=="ECHO_mapText": |
if splitted[1]=="en": |
if splitted[1]=="en": |
obj.locale_en.pt_edit(REQUEST.form[key],None) |
obj.locale_en.pt_edit(REQUEST.form[key],obj.locale_en.content_type) |
else: |
else: |
obj.pt_edit(REQUEST.form[key],None) |
obj.pt_edit(REQUEST.form[key],obj.content_type) |
else: |
else: |
text=obj.ZopeFind(obj,obj_metatypes=['ECHO_mapText']) |
text=obj.ZopeFind(obj,obj_metatypes=['ECHO_mapText']) |
if splitted[1]=="en": |
if splitted[1]=="en": |
|
|
text[0][1].locale_en.pt_edit(REQUEST.form[key],None) |
text[0][1].locale_en.pt_edit(REQUEST.form[key],text[0][1].locale_en.content_type) |
else: |
else: |
text[0][1].pt_edit(REQUEST.form[key],None) |
text[0][1].pt_edit(REQUEST.form[key],text[0][1].content_type) |
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect('manage_main') |
RESPONSE.redirect('manage_main') |
|
|
Line 2612 class ECHO_collection(CatalogAware, Fold
|
Line 2630 class ECHO_collection(CatalogAware, Fold
|
ret="""<?xml version="1.0" encoding="utf-8" ?>""" |
ret="""<?xml version="1.0" encoding="utf-8" ?>""" |
return ret+"<collection>"+getCollection(self,pwstr=pwstr)+"</collection>" |
return ret+"<collection>"+getCollection(self,pwstr=pwstr)+"</collection>" |
|
|
def createAllJSAreas(self): |
def createAllJSAreas(self,mapColTypes=None): |
"""create area calls for JavaScript""" |
"""create area calls for JavaScript""" |
areas = self.getAllMapAreas() |
areas = self.getAllMapAreas(mapColTypes=mapColTypes) |
return self.createJSAreas(areas) |
return self.createJSAreas(areas) |
|
|
|
|
Line 2839 class ECHO_collection(CatalogAware, Fold
|
Line 2857 class ECHO_collection(CatalogAware, Fold
|
"""javascript""" |
"""javascript""" |
return sendFile(self, 'js/hl_add.js', 'text/plain') |
return sendFile(self, 'js/hl_add.js', 'text/plain') |
|
|
def getAllMapAreas(self,mapColTypes=['ECHO_collection','ECHO_resource','ECHO_link','ECHO_externalLink']): |
def getAllMapAreas(self,mapColTypes=None): |
"""Give list of coordinates""" |
"""Give list of coordinates""" |
|
if mapColTypes is None: |
|
mapColTypes=['ECHO_collection','ECHO_resource','ECHO_link','ECHO_externalLink'] |
|
|
areas=[] |
areas=[] |
for entry in self.getSubCols(subColTypes=mapColTypes): |
for entry in self.getSubCols(subColTypes=mapColTypes): |