From: gfawcett <gfawcett@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Tue, 28 Dec 2010 17:10:37 +0000 (+0000)
Subject: fixed problem introduced in r1126, "fix problem in feeds related to URL items"
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=de836d474c1e163ed8e407a081fc385873b7aa8f;p=Syrup.git

fixed problem introduced in r1126, "fix problem in feeds related to URL items"

I forgot the SCRIPT_NAME.

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@1128 6d9bc8c9-1ec2-4278-b937-99fde70a366f
---

diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py
index 5dd63a2..6752b57 100644
--- a/conifer/syrup/models.py
+++ b/conifer/syrup/models.py
@@ -343,7 +343,8 @@ class Site(BaseModel):
         # I'm not fond of this being here. I think I'll leave this and
         # item_url non-implemented, and monkey-patch them in views.py.
         req = get_request()
-        return req.build_absolute_uri('/site/%d/%s' % (self.id, suffix))
+        script = req.META['SCRIPT_NAME']
+        return req.build_absolute_uri('%s/site/%d/%s' % (script, self.id, suffix))
 
     def generate_new_passkey(self):
         # todo: have a pluggable passkey algorithm.
@@ -695,8 +696,10 @@ class Item(BaseModel):
             return None
         else:
             req = get_request()
+            script = req.META['SCRIPT_NAME']
             return req.build_absolute_uri(
-                '/site/%d/item/%d/dl/%s' % (
+                '%s/site/%d/item/%d/dl/%s' % (
+                    script,
                     self.site_id, self.id,
                     self.fileobj.name.split('/')[-1]))
             
@@ -705,7 +708,9 @@ class Item(BaseModel):
             return self.url
         else:
             req = get_request()
-            return req.build_absolute_uri('/site/%d/item/%d/%s' % (
+            script = req.META['SCRIPT_NAME']
+            return req.build_absolute_uri('%s/site/%d/item/%d/%s' % (
+                    script,
                     self.site_id, self.id, suffix))
 
     def parent_url(self, suffix=''):