version 1.47.2.62, 2006/10/27 18:37:20
|
version 1.47.2.69, 2006/12/08 13:54:41
|
Line 2
|
Line 2
|
for organizing and maintaining the different project pages |
for organizing and maintaining the different project pages |
|
|
""" |
""" |
#TODO: mechanismus fur links to personen ueberarbeiten, da jetzt alle e_mails als members auftauchen unabhaengig vom status publish_the_data |
#TODO: mechanismus fur links to personen ueberarbeiten, da jetzt alle e_mails als members auftauchen unabhaenig vom status publish_the_data |
#TODO: was passiert wenn aenderungen von jochen im filemaker nicht mit den aenderungen im sql uebereinstimmen |
#TODO: was passiert wenn aenderungen von jochen im filemaker nicht mit den aenderungen im sql uebereinstimmen |
#TODO: in einzelnen projecte steht als pfad auf die bilder noch wwwneu statt www |
#TODO: in einzelnen projecte steht als pfad auf die bilder noch wwwneu statt www |
|
|
Line 33 from Ft.Xml.XPath import Evaluate
|
Line 33 from Ft.Xml.XPath import Evaluate
|
from Ft.Xml.XPath.Context import Context |
from Ft.Xml.XPath.Context import Context |
from Ft.Xml.Domlette import NonvalidatingReader,PrettyPrint, Print |
from Ft.Xml.Domlette import NonvalidatingReader,PrettyPrint, Print |
from Ft.Xml import EMPTY_NAMESPACE |
from Ft.Xml import EMPTY_NAMESPACE |
|
import copy |
|
|
definedFields=['WEB_title','xdata_01','xdata_02','xdata_03','xdata_04','xdata_05','xdata_06','xdata_07','xdata_08','xdata_09','xdata_10','xdata_11','xdata_12','xdata_13','WEB_project_header','WEB_project_description','WEB_related_pub'] |
definedFields=['WEB_title','xdata_01','xdata_02','xdata_03','xdata_04','xdata_05','xdata_06','xdata_07','xdata_08','xdata_09','xdata_10','xdata_11','xdata_12','xdata_13','WEB_project_header','WEB_project_description','WEB_related_pub'] |
|
|
Line 147 class MPIWGLink(SimpleItem):
|
Line 148 class MPIWGLink(SimpleItem):
|
else: |
else: |
return self.getObj().weight |
return self.getObj().weight |
|
|
manage_options=SimpleItem.manage_options+( |
manage_options=( |
{'label':'main config','action':'changeLinkForm'}, |
{'label':'main config','action':'changeLinkForm'}, |
) |
)+SimpleItem.manage_options |
|
|
|
|
def changeLinkForm(self): |
def changeLinkForm(self): |
Line 166 class MPIWGLink(SimpleItem):
|
Line 167 class MPIWGLink(SimpleItem):
|
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect('manage') |
RESPONSE.redirect('manage') |
|
|
def index_html(self): |
def index_html(self,**argv): |
"""index""" |
"""index""" |
|
|
return self.getObj().pt_render(extra_context={'here':self}) |
return self.getObj()(extra_context={'here':self},**argv) |
|
|
|
|
def manage_addMPIWGLinkForm(self): |
def manage_addMPIWGLinkForm(self): |
Line 281 def manage_addMPIWGTemplate(self, MPIWGT
|
Line 282 def manage_addMPIWGTemplate(self, MPIWGT
|
|
|
|
|
class MPIWGRoot(ZSQLExtendFolder): |
class MPIWGRoot(ZSQLExtendFolder): |
"""Stammordner für den Web-Server""" |
"""Stammordner fuer den Web-Server""" |
|
|
fieldLabels={'WEB_title':'WEB_Title','xdata_01':'Responsible Scientists','xdata_02':'Department', |
fieldLabels={'WEB_title':'WEB_Title','xdata_01':'Responsible Scientists','xdata_02':'Department', |
'xdata_03':'Historical Persons','xdata_04':'Time period', |
'xdata_03':'Historical Persons','xdata_04':'Time period', |
Line 294 class MPIWGRoot(ZSQLExtendFolder):
|
Line 295 class MPIWGRoot(ZSQLExtendFolder):
|
folders=['MPIWGProject','Folder','ECHO_Navigation'] |
folders=['MPIWGProject','Folder','ECHO_Navigation'] |
meta_type='MPIWGRoot' |
meta_type='MPIWGRoot' |
|
|
|
|
def harvestProjects(self): |
def harvestProjects(self): |
"""harvest""" |
"""harvest""" |
folder="/tmp" |
folder="/tmp" |
Line 324 class MPIWGRoot(ZSQLExtendFolder):
|
Line 326 class MPIWGRoot(ZSQLExtendFolder):
|
|
|
return str |
return str |
|
|
|
|
|
def browserCheck(self): |
|
"""check the browsers request to find out the browser type""" |
|
bt = {} |
|
ua = self.REQUEST.get_header("HTTP_USER_AGENT") |
|
bt['ua'] = ua |
|
bt['isIE'] = False |
|
bt['isN4'] = False |
|
if string.find(ua, 'MSIE') > -1: |
|
bt['isIE'] = True |
|
else: |
|
bt['isN4'] = (string.find(ua, 'Mozilla/4.') > -1) |
|
|
|
try: |
|
nav = ua[string.find(ua, '('):] |
|
ie = string.split(nav, "; ")[1] |
|
if string.find(ie, "MSIE") > -1: |
|
bt['versIE'] = string.split(ie, " ")[1] |
|
except: pass |
|
|
|
bt['isMac'] = string.find(ua, 'Macintosh') > -1 |
|
bt['isWin'] = string.find(ua, 'Windows') > -1 |
|
bt['isIEWin'] = bt['isIE'] and bt['isWin'] |
|
bt['isIEMac'] = bt['isIE'] and bt['isMac'] |
|
bt['staticHTML'] = False |
|
|
|
return bt |
|
|
|
|
def versionHeaderEN(self): |
def versionHeaderEN(self): |
"""version header text""" |
"""version header text""" |
|
|
Line 460 class MPIWGRoot(ZSQLExtendFolder):
|
Line 491 class MPIWGRoot(ZSQLExtendFolder):
|
path = string.replace(url, root, '') |
path = string.replace(url, root, '') |
paths = path.split('/') |
paths = path.split('/') |
if len(paths) > 0: |
if len(paths) > 0: |
return paths[1] |
sec = paths[1] |
|
if sec.find('.') < 0: |
|
return sec |
|
else: |
|
return None |
return None |
return None |
|
|
def getSectionStyle(self, name, style=""): |
def getSectionStyle(self, name, style=""): |
Line 605 class MPIWGRoot(ZSQLExtendFolder):
|
Line 640 class MPIWGRoot(ZSQLExtendFolder):
|
"""quote""" |
"""quote""" |
return urllib.unquote(str) |
return urllib.unquote(str) |
|
|
def harvestHistoricalPersons(self): |
|
"""erstelle liste aller erwaehnten actors""" |
|
|
|
def normalize(str): |
|
"""loesche fuhrendes space""" |
|
if (len(str)>1) and (str[0]==" "): |
|
ret=str[1:] |
|
else: |
|
ret=str |
|
return ret |
|
|
|
list={} |
|
projects=self.ZopeFind(self.projects,obj_metatypes=['MPIWGProject']) |
|
|
|
for project in projects: |
|
lg=len(project[1].xdata_03[0])-1 |
|
|
|
if (lg>1) and (project[1].xdata_03[0][lg]==";"): |
|
project[1].xdata_03[0]=project[1].xdata_03[0][0:lg] |
|
|
|
|
|
|
|
|
|
try: |
|
if len(project[1].xdata_03[0].split(";"))>1: # guess if separator is ; |
|
for person in project[1].xdata_03[0].split(";"): |
|
personNormal=normalize(person) |
|
if personNormal in list.keys(): |
|
list[urllib.quote(personNormal)][1].append(project[1]) |
|
else: |
|
list[urllib.quote(personNormal)]=(personNormal,[project[1]]) |
|
else: #guess , is sepeator |
|
for person in project[1].xdata_03[0].split(","): |
|
personNormal=normalize(person) |
|
if urllib.quote(personNormal) in list.keys(): |
|
list[urllib.quote(personNormal)][1].append(project[1]) |
|
else: |
|
list[urllib.quote(personNormal)]=(personNormal,[project[1]]) |
|
|
|
except: |
|
zLOG.LOG("MPIWG Web (harvestHistoricalPerson)",zLOG.ERROR,"cannot analyize: %s"%repr(project)) |
|
|
|
|
|
return list |
|
|
|
def storeHistoricalPersons(self,RESPONSE=None): |
|
"""store persons""" |
|
self.personDict={} |
|
personDict=self.harvestHistoricalPersons() |
|
for person in personDict.keys(): |
|
for project in personDict[person][1]: |
|
if person in self.personDict.keys(): |
|
self.personDict[person][1].append((project.absolute_url(),project.WEB_title[0],project.xdata_01[0])) |
|
else: |
|
self.personDict[person]=(personDict[person][0],[(project.absolute_url(),project.WEB_title[0],project.xdata_01[0])]) |
|
|
|
if RESPONSE is not None: |
|
RESPONSE.redirect("showHistoricalPersons") |
|
|
|
|
|
def getPersonDict(self,name): |
|
"""name von dict""" |
|
|
|
try: |
|
return self.personDict[name][0].encode('utf-8') |
|
except: |
|
return self.personDict[name][0] |
|
return self.personDict[name][0].decode('latin-1').encode('utf-8') |
|
|
|
|
|
def showHistoricalPersons(self): |
|
"""show persons""" |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','showHistoricalPersons')).__of__(self) |
|
return pt() |
|
|
|
|
|
def editHistoricalPersonsForm(self): |
|
"""edit historical persons for consistency""" |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editHistoricalPersonsForm')).__of__(self) |
|
return pt() |
|
|
|
def getProjectsByFieldContent(self,fieldName,fieldContentsEntry, date=None): |
def getProjectsByFieldContent(self,fieldName,fieldContentsEntry, date=None): |
"""gib alle Projekte aus mit Value von field mit fieldName enthält ein Element der Liste fieldContents""" |
"""gib alle Projekte aus mit Value von field mit fieldName enthaelt ein Element der Liste fieldContents""" |
def sort(x,y): |
def sort(x,y): |
return cmp(x.WEB_title[0],y.WEB_title[0]) |
return cmp(x.WEB_title[0],y.WEB_title[0]) |
|
|
Line 1111 class MPIWGRoot(ZSQLExtendFolder):
|
Line 1067 class MPIWGRoot(ZSQLExtendFolder):
|
title=[project[0].getContent('WEB_title')] |
title=[project[0].getContent('WEB_title')] |
#print title |
#print title |
|
|
if idNr[0]=="x": # kompatibilitŠt mit alter Konvention, x vor der Nummer macht project inactive |
if idNr[0]=="x": # kompatibilitaet mit alter Konvention, x vor der Nummer macht project inactive |
project[0].setActiveFlag(False) |
project[0].setActiveFlag(False) |
|
|
if (not dep) or (idNr[0]==dep): #falls dep gesetzt ist nur dieses hinzufŸgen. |
if (not dep) or (idNr[0]==dep): #falls dep gesetzt ist nur dieses hinzufuegen. |
if onlyActive and project[0].isActiveProject(): #nur active projekte |
if onlyActive and project[0].isActiveProject(): #nur active projekte |
returnList.append((depth,nr,title,project[0])) |
returnList.append((depth,nr,title,project[0])) |
elif not onlyActive: |
elif not onlyActive: |
Line 1296 class MPIWGRoot(ZSQLExtendFolder):
|
Line 1252 class MPIWGRoot(ZSQLExtendFolder):
|
return string.join(ret,";") |
return string.join(ret,";") |
|
|
|
|
|
def getMembersFromList(self,list): |
|
"""get member names from person full text list""" |
|
memberlist=[] |
|
persons=list.split(";") |
|
for person in persons: |
|
if len(person)>1: #nicht nur Trennzeichen |
|
splitted=person.split(",") |
|
if len(splitted)==1: |
|
splitted=person.lstrip().rstrip().split(" ") |
|
splittedNew=[re.sub(r'\s(.*)','$1',split) for split in splitted] |
|
if splittedNew[0]=='': |
|
del splittedNew[0] |
|
search=string.join(splittedNew,' AND ') |
|
|
|
if not search=='': |
|
try: |
|
member=self.MembersCatalog({'title':search}) |
|
except: |
|
member=None |
|
|
|
if member and (member[0].getObject().isPublished()): |
|
if person =="Otto Sibum" : person="H. Otto Sibum" |
|
if person =="Norton Wise" : person="M. Norton Wise" |
|
#memberlist.append("<a href=%s >%s</a>"%(member[0].absolute_url,person.encode('utf-8'))) |
|
memberlist.append((person, member[0].getObject().getId())) |
|
else: |
|
#memberlist.append("%s"%person.encode('utf-8')) |
|
memberlist.append((person,None)) |
|
return memberlist |
|
|
def getUrlFromPerson(self,list): |
def getUrlFromPerson(self,list): |
"""get urls to person list""" |
"""get urls to person list""" |
ret=[] |
ret=[] |
Line 1322 class MPIWGRoot(ZSQLExtendFolder):
|
Line 1308 class MPIWGRoot(ZSQLExtendFolder):
|
if person =="Otto Sibum" : person="H. Otto Sibum" |
if person =="Otto Sibum" : person="H. Otto Sibum" |
if person =="Norton Wise" : person="M. Norton Wise" |
if person =="Norton Wise" : person="M. Norton Wise" |
#ret.append("<a href=%s >%s</a>"%(proj[0].absolute_url,person.encode('utf-8'))) |
#ret.append("<a href=%s >%s</a>"%(proj[0].absolute_url,person.encode('utf-8'))) |
ret.append("<a href=%s >%s</a>"%(proj[0].absolute_url+"/index.html",person)) |
if self.MPIWGrootURL().split("/")[-1]=='en': |
|
tmpPath="/en/staff/members/" |
|
else: |
|
tmpPath="/de/mitarbeiter/members/" |
|
ret.append("<a href=%s >%s</a>"%(tmpPath+proj[0].getObject().getId()+"/index.html",person)) |
else: |
else: |
#ret.append("%s"%person.encode('utf-8')) |
#ret.append("%s"%person.encode('utf-8')) |
ret.append("%s"%person) |
ret.append("%s"%person) |
Line 1517 class MPIWGRoot(ZSQLExtendFolder):
|
Line 1507 class MPIWGRoot(ZSQLExtendFolder):
|
results[id]=[] |
results[id]=[] |
objId=found.getObject().getId() |
objId=found.getObject().getId() |
if not (objId in results[id]): |
if not (objId in results[id]): |
print "added %s for %s"%(id,objId) |
print "d %s for %s"%(id,objId) |
results[id].append(objId) |
results[id].append(objId) |
self.nameIndex=results |
self.nameIndex=results |
return results |
return results |
|
|
|
def editNameIndexHTML(self): |
|
"""edit the name index""" |
|
if not hasattr(self,'nameIndexEdited'): # falls editierter index noch nicht existiert, kopiere automatisch erstellten |
|
self.nameIndexEdited=copy.copy(self.nameIndex) |
|
print "huh" |
|
#self.nameIndexEdited=copy.copy(self.nameIndex) |
|
#print self.nameIndexEdited |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editHistoricalNames.zpt')).__of__(self) |
|
return pt() |
|
|
|
def getNamesInProject(self,projectId): |
|
"""get all names ofnameIndexEdited which are references in projec with projectId""" |
|
|
|
ret=[] |
|
for name in self.nameIndexEdited.keys(): |
|
if projectId in self.nameIndexEdited[name]: |
|
ret.append(name) |
|
|
|
return ret |
|
|
|
def editNameIndex(self,RESPONSE=None,name=None,occurrances=None,submit=None): |
|
"""edit the index""" |
|
nI=self.nameIndexEdited # mI introduced to make sure that changes to nameIndexEdited are know to ZODB |
|
if submit=="delete": |
|
|
|
|
|
dh=getattr(self,'deletedHistoricalNames',{}) |
|
if not dh.has_key(name): |
|
dh=occurrances.split("\n") |
|
else: |
|
dh+=occurrances.split("\n") |
|
|
|
self.deletedHistoricalNames=dh |
|
|
|
del self.nameIndexEdited[name] |
|
|
|
|
|
elif (submit=="change"): |
|
|
|
nI[name]=occurrances.split("\n")[0:] |
|
|
|
elif (submit=="add"): |
|
if not nI.has_key(name): |
|
nI[name]=occurrances.split("\n") |
|
else: |
|
nI[name]+=occurrances.split("\n") |
|
|
|
self.nameIndexEdited=nI |
|
|
|
|
|
if RESPONSE is not None: |
|
RESPONSE.redirect('editNameIndexHTML') |
|
|
|
|
|
|
|
def restoreIndex(self): |
|
"""restore""" |
|
self.nameIndexEdited=self.nameIndex |
|
return "done" |
|
|
|
def changeHistoricalNames(self,projId,nameListTmp): |
|
"""add resp change nameIndexEdited b |
|
y adding/changing names menitionen in project projId""" |
|
|
|
#clear namelist from blanks |
|
nameList=[x.lstrip().rstrip() for x in nameListTmp] |
|
|
|
nI=self.nameIndexEdited |
|
for name in nameList: |
|
if not nI.has_key(name): #neuer Name |
|
nI[name]=[projId] |
|
|
|
for name in nI.keys(): |
|
|
|
if name in nameList: #checke if name in name List |
|
|
|
if not(projId in nI[name]): #nicht in listt -> hinzufuegen |
|
|
|
nI[name].append(projId) |
|
|
|
"""loesche falls projekt in nI list aber der name nicht mehr |
|
in der namensliste des projectes auftaucht |
|
""" |
|
|
|
for pr in nI[name]: |
|
|
|
if (pr==projId) and (not name in nameList): |
|
|
|
nI[name].remove(pr) |
|
|
|
self.nameIndexEdited=nI |
|
|
|
|
|
|
def manage_addMPIWGRootForm(self): |
def manage_addMPIWGRootForm(self): |
"""form for adding the root""" |
"""form for adding the root""" |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addMPIWGRootForm.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addMPIWGRootForm.zpt')).__of__(self) |
Line 1632 class MPIWGProject(CatalogAware,Folder):
|
Line 1716 class MPIWGProject(CatalogAware,Folder):
|
for split in splitted[1:]: |
for split in splitted[1:]: |
tmp=split.split("</p>") |
tmp=split.split("</p>") |
#return repr(splitted[1]) |
#return repr(splitted[1]) |
|
|
try: |
try: |
imageURLs.append(tmp[0].split("\"")[1].encode('utf-8')) |
imageURLs.append(tmp[0].split("\"")[1].encode('utf-8')) |
except: |
except: |
|
|
|
try: |
imageURLs.append(tmp[0].split("src=")[1].split(" ")[0].encode('utf-8')) |
imageURLs.append(tmp[0].split("src=")[1].split(" ")[0].encode('utf-8')) |
|
except: |
|
imageURLs.append("") |
|
|
split2="</p>".join(tmp[1:]) |
split2="</p>".join(tmp[1:]) |
|
|
Line 1777 class MPIWGProject(CatalogAware,Folder):
|
Line 1866 class MPIWGProject(CatalogAware,Folder):
|
else: |
else: |
return getattr(publications[-1][1],'place',0) |
return getattr(publications[-1][1],'place',0) |
|
|
def deletePublication(self,id,RESPONSE=None): |
def deletePublication(self,id,RESPONSE=Nedione): |
"""delete Publication id""" |
"""delete Publication id""" |
self.manage_delObjects([id]) |
self.manage_delObjects([id]) |
if RESPONSE: |
if RESPONSE: |
Line 1785 class MPIWGProject(CatalogAware,Folder):
|
Line 1874 class MPIWGProject(CatalogAware,Folder):
|
|
|
def getImages(self): |
def getImages(self): |
"""get all Images""" |
"""get all Images""" |
|
|
def sort_images(x,y): |
def sort_images(x,y): |
return cmp(getattr(x[1],'place',0),getattr(y[1],'place',0)) |
return cmp(getattr(x[1],'place',0),getattr(y[1],'place',0)) |
|
|
|
|
|
if (getattr(self,'imageURL','')!='') or (getattr(self,'imagecap','')!='') : |
|
try: |
|
self.addImage(None,getattr(self,'imagecap',''),RESPONSE=None,filename=getattr(self,'imageURL','')) |
|
except: |
|
pass |
|
self.imageURL='' |
|
self.imagecap='' |
|
|
images=self.ZopeFind(self,obj_metatypes=['MPIWGProject_image']) |
images=self.ZopeFind(self,obj_metatypes=['MPIWGProject_image']) |
|
|
images.sort(sort_images) |
images.sort(sort_images) |
Line 1818 class MPIWGProject(CatalogAware,Folder):
|
Line 1917 class MPIWGProject(CatalogAware,Folder):
|
else: |
else: |
return False |
return False |
|
|
|
|
def addImage(self,fileHd,caption,RESPONSE=None,filename=None): |
def addImage(self,fileHd,caption,RESPONSE=None,filename=None): |
"""add an MPIWG_Project_image""" |
"""add an MPIWG_Project_image""" |
|
|
Line 1834 class MPIWGProject(CatalogAware,Folder):
|
Line 1934 class MPIWGProject(CatalogAware,Folder):
|
obj.caption=caption[0:] |
obj.caption=caption[0:] |
obj.enabled=True; |
obj.enabled=True; |
obj.place=self.getLastImageNumber()+1 |
obj.place=self.getLastImageNumber()+1 |
|
obj.id=filename |
|
|
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect('manageImages') |
RESPONSE.redirect('manageImages') |
Line 1955 class MPIWGProject(CatalogAware,Folder):
|
Line 2056 class MPIWGProject(CatalogAware,Folder):
|
|
|
|
|
def generateTemplate(self,RESPONSE=None): |
def generateTemplate(self,RESPONSE=None): |
"""Erzeuge Template für defined fields not_used""" |
"""Erzeuge Template fuer defined fields not_used""" |
|
|
id="index_html" |
id="index_html" |
title=id |
title=id |
Line 2047 class MPIWGProject(CatalogAware,Folder):
|
Line 2148 class MPIWGProject(CatalogAware,Folder):
|
return pt() |
return pt() |
|
|
def getGetNeighbourhood(self,wordStr, length=100,tagging=True): |
def getGetNeighbourhood(self,wordStr, length=100,tagging=True): |
"""finde umgebung um die worte in wordStr, zurŸckgegeben wird eine Array mit den Umgebungen von Fundstellen der Worte |
"""finde umgebung um die worte in wordStr, zurueckgegeben wird eine Array mit den Umgebungen von Fundstellen der Worte |
alle Tags werden entfernt, die Fundstellen werden mit <span class="found">XX</span> getaggt, die Umgebungen werden |
alle Tags werden entfernt, die Fundstellen werden mit <span class="found">XX</span> getaggt, die Umgebungen werden |
case insensitive gesucht |
case insensitive gesucht |
@param wordStr: string mit Worten getrennt durch Leerzeichen, Phrasen sind mit " gekennzeichnet |
@param wordStr: string mit Worten getrennt durch Leerzeichen, Phrasen sind mit " gekennzeichnet |
"eine phrase", "*" bezeichnet wildcards und wird ignoriert" |
"eine phrase", "*" bezeichnet wildcards und wird ignoriert" |
@param length: optional, default wert 100, 2*length ist die grš§e der Umgebung |
@param length: optional, default wert 100, 2*length ist die groesse der Umgebung |
@param tagging: optional default wert true, kein span tag wird erzweugt falls tag=false |
@param tagging: optional default wert true, kein span tag wird erzweugt falls tag=false |
""" |
""" |
|
|
ret=[] # nimmt das Array auf, dass spŠter zurŸckgegeben wird |
ret=[] # nimmt das Array auf, dass spaeter zurueckgegeben wird |
ranges=[] #Array mit tupeln x,y wobei x die Position des Anfang und y des Endes der i-ten Umgebung angiebt |
ranges=[] #Array mit tupeln x,y wobei x die Position des Anfang und y des Endes der i-ten Umgebung angiebt |
|
|
def isInRanges(nr,length): |
def isInRanges(nr,length): |
"""test ob eine gegeben Position nr schon irgendwo in einer Umgebung ist, gibt den Index des ersten Wertes aus ranges zurŸck, |
"""test ob eine gegeben Position nr schon irgendwo in einer Umgebung ist, gibt den Index des ersten Wertes aus ranges zurueck, |
-1, wenn kein Treffer |
-1, wenn kein Treffer |
|
|
@param nr: Position die geprŸft werden soll |
@param nr: Position die geprueft werden soll |
@param length: LŠnge des Wortes das geprŸft werden soll |
@param length: Laenge des Wortes das geprueft werden soll |
""" |
""" |
for x in ranges: |
for x in ranges: |
if (x[0]<=nr) and (nr < (x[1]-length)): |
if (x[0]<=nr) and (nr < (x[1]-length)): |
Line 2105 class MPIWGProject(CatalogAware,Folder):
|
Line 2206 class MPIWGProject(CatalogAware,Folder):
|
|
|
#is word already in one of the results |
#is word already in one of the results |
nr=isInRanges(pos,len(word)) |
nr=isInRanges(pos,len(word)) |
if nr >=0:# word ist in einer schon gefunden Umgebung, dann vergrš§ere diese |
if nr >=0:# word ist in einer schon gefunden Umgebung, dann vergroessere diese |
x=min(ranges[nr][0],x) |
x=min(ranges[nr][0],x) |
y=max(ranges[nr][1],y) |
y=max(ranges[nr][1],y) |
|
|
Line 2115 class MPIWGProject(CatalogAware,Folder):
|
Line 2216 class MPIWGProject(CatalogAware,Folder):
|
ranges[nr]=(x,y) # neue Position der Umgebung |
ranges[nr]=(x,y) # neue Position der Umgebung |
|
|
ret[nr]=str # neue Umgebung |
ret[nr]=str # neue Umgebung |
else: # andernfalls neue Umgebung hinzufŸgen |
else: # andernfalls neue Umgebung hinzufuegen |
ranges.append((x,y)) |
ranges.append((x,y)) |
|
|
ret.append(str) |
ret.append(str) |
Line 2226 class MPIWGProject(CatalogAware,Folder):
|
Line 2327 class MPIWGProject(CatalogAware,Folder):
|
try: |
try: |
self.imageURL=tmp[0].split("\"")[1].encode('utf-8') |
self.imageURL=tmp[0].split("\"")[1].encode('utf-8') |
except: |
except: |
|
try: |
self.imageURL=tmp[0].split("src=")[1].split(" ")[0].encode('utf-8') |
self.imageURL=tmp[0].split("src=")[1].split(" ")[0].encode('utf-8') |
|
except: |
|
self.imageURL="" |
|
|
split2="</p>".join(tmp[1:]) |
split2="</p>".join(tmp[1:]) |
|
|
Line 2249 class MPIWGProject(CatalogAware,Folder):
|
Line 2353 class MPIWGProject(CatalogAware,Folder):
|
else: |
else: |
text5=text2 |
text5=text2 |
|
|
#teste ob WEB_project_description und keine führenden p tags |
#teste ob WEB_project_description und keine fuehrenden p tags |
if (len(text5)>4) and (not text5[0:3]=='<p>') and (field=='WEB_project_description'): |
if (len(text5)>4) and (not text5[0:3]=='<p>') and (field=='WEB_project_description'): |
text5= "<p>"+text5+"</p>" |
text5= "<p>"+text5+"</p>" |
|
|
|
|
#filter image |
#filter image |
|
|
|
text5=text5.lstrip().rstrip() #loescher leerzeichen und einzelndes br |
|
if (text5=="<br>") or (text5=="<br/>"): |
|
text5="" |
|
|
return text5.encode('utf-8') |
return text5.encode('utf-8') |
|
|
Line 2376 class MPIWGProject(CatalogAware,Folder):
|
Line 2483 class MPIWGProject(CatalogAware,Folder):
|
|
|
setattr(self,x,[self.REQUEST[x].decode('utf-8')]) |
setattr(self,x,[self.REQUEST[x].decode('utf-8')]) |
|
|
|
|
|
if self.REQUEST.has_key('historicalNames'): |
|
self.en.changeHistoricalNames(self.getId(),self.REQUEST['historicalNames'].split("\n")) |
|
|
if self.REQUEST.has_key('active'): |
if self.REQUEST.has_key('active'): |
self.setActiveFlag(True) |
self.setActiveFlag(True) |
else: |
else: |