[cvs-annodex] commit (/annodex): cmmlwiki/trunk/cmmlwiki/utils.py

[conrad]

Update of /annodex (new revision 1920)

Modified files:
   cmmlwiki/trunk/cmmlwiki/utils.py

Log Message:
add optional include_host parameter to all url/path generators


Modified: cmmlwiki/trunk/cmmlwiki/utils.py
===================================================================
--- cmmlwiki/trunk/cmmlwiki/utils.py	2006-02-01 07:24:47 UTC (rev 1919)
+++ cmmlwiki/trunk/cmmlwiki/utils.py	2006-02-01 07:31:57 UTC (rev 1920)
@@ -97,42 +97,42 @@
 
     return url
 
-def iname2html (iname):
+def iname2html (iname, include_host=False):
     if (iname == None):
         return None
     else:
-        return wikiurl(iname)
+        return wikiurl(iname, include_host)
 
-def iname2play (iname):
+def iname2play (iname, include_host=False):
     if (iname == None):
         return None
     else:
         iname_parts = string.split (iname, '?', 1)
         if (len(iname_parts) == 2):
-            return wikiurl ('%s.axv?%s' % (iname_parts[0], iname_parts[1]))
+            return wikiurl ('%s.axv?%s' % (iname_parts[0], iname_parts[1]), include_host)
         else:
-            return wikiurl ('%s.axv' % iname)
+            return wikiurl ('%s.axv' % iname, include_host)
 
-def iname2frame (iname):
+def iname2frame (iname, include_host=False):
     if (iname == None):
         return None
     else:
         iname_parts = string.split (iname, '?', 1)
         if (len(iname_parts) == 2):
-            return wikiurl ('%s.png?%s' % (iname_parts[0], iname_parts[1]))
+            return wikiurl ('%s.png?%s' % (iname_parts[0], iname_parts[1]), include_host)
         else:
-            return wikiurl ('%s.png' % (iname))
+            return wikiurl ('%s.png' % (iname), include_host)
 
-def url2play (url):
+def url2play (url, include_host=False):
     if (url != None and url[:5] == 'wiki:'):
         iname = url[5:]
-        return iname2play (iname)
+        return iname2play (iname, include_host)
     else:
         return url
 
-def url2html (url):
+def url2html (url, include_host=False):
     if (url != None and url[:5] == 'wiki:'):
         iname = url[5:]
-        return iname2html (iname)
+        return iname2html (iname, include_host)
     else:
         return url


-- 
conrad