moved settings

solrfet2020/solr_to_objects.py

@@ -1,18 +1,16 @@
 from .utils import fet, fetmember
 from .utils import strip_html
 from urllib.parse import urljoin,urlparse
-from . import env
+import settings
 
 def pull_post(slug, o):
-    #docs = result.docs
-    highlights =o["highlights"]
     post = fet.find_one({"slug": slug})
 
     def create_text(p):
         return "<b>" + \
         p["title"]+ "</b>: "+ \
         "(%s) " % p["public_date"] + \
-        urljoin(env('TARGET'),
+        urljoin(settings.TARGET,
         p["url"]).rstrip("/")+"  "+\
         p["highlights"]
 
@@ -23,14 +21,14 @@ def pull_post(slug, o):
         post["typ"] = "posts"
         post["highlights"]=create_highlights(o["highlights"])
         post["text"] = create_text(post)
-        if post["url"]: post["url"]= urljoin(env('TARGET'),post["url"]).rstrip("/")
-        if post["imageurl"]:post["image"]=urljoin(env('TARGET'),urlparse(post["imageurl"]).path)
+        if post["url"]: post["url"]= urljoin(settings.TARGET,post["url"]).rstrip("/")
+        if post["imageurl"]:post["image"]=urljoin(settings.TARGET,urlparse(post["imageurl"]).path)
     return post
 
 def pull_member(id, o):
     member = fetmember.get(id)
     if not member: return None
-    member["url"]=urljoin(env('TARGET'), "/member/%s" % id)
+    member["url"]=urljoin(settings.TARGET, "/member/%s" % id)
     member["text"]="<b>"+member["firstname"]+" "+member["surname"]+"</b>"+"  "+member["url"]
     member["imageurl"]=member["image"]
     member["title"] =member["firstname"]+" "+member["surname"]