modify various script to accomodate Len's search changes

4 files changed, 39 insertions, 18 deletions

diff --git a/lib/d2/app/controllers/index.py b/lib/d2/app/controllers/index.py
index 7febb82..1c6ae66 100644
--- a/lib/d2/app/controllers/index.py
+++ b/lib/d2/app/controllers/index.py
@@ -30,18 +30,18 @@ class IndexController(BaseController):
             self._plot_ = PlotAdapter.load()
         return self._plot_
 
-    def _show_map(self, id_type, id):
-        if id_type == 'occupant':
-            forges = self._forge.get_forge_by_occupant_id(id)
-            details = self._detail.occupant_details(id)
+    def _show_map(self, occupant_id, plot_id):
+        if plot_id:
+            forges = self._forge.get_forge_by_plot_id(plot_id)
+            details = self._detail.details(plot_id, occupant_id)
+            plots = self._plot.get_all([plot_id])
+        else: 
+            forges = self._forge.get_forge_by_occupant_id(occupant_id)
+            details = self._detail.details(plot_id, occupant_id)
             plots = []
             if len(forges) > 0:
                 plot_ids = [forge.plot_id for forge in forges]
                 plots = self._plot.get_all(plot_ids)
-        else: # plot
-            forges = self._forge.get_forge_by_plot_id(id)
-            details = self._detail.plot_details(id)
-            plots = self._plot.get_all([id])
 
         self.render('index.html', 
                 mode="map", 
@@ -50,9 +50,20 @@ class IndexController(BaseController):
                 forges=forges)
 
 
-    def get(self, id_type=None, id=None):
-        if id_type and id:
-            self._show_map(id_type, id)
+    def get(self, type_1=None, id_1=None, type_2=None, id_2=None):
+        if type_1 and id_1:
+            if type_2 and id_2:
+                occupant_id = id_1
+                plot_id = id_2
+            else:
+                if type_1 == 'occupant':
+                    occupant_id = id_1
+                    plot_id = None
+                else:
+                    plot_id = id_1
+                    occupant_id = None
+
+            self._show_map(occupant_id, plot_id)
         else:
             self.render('index.html', mode="get")
         
@@ -62,8 +73,8 @@ class IndexController(BaseController):
         details = self._search.search(name)
 
         if len(details) == 1:
-            self._show_map(details[0].id_type,
-                           details[0].id)
+            self._show_map(details[0].occupant_id,
+                           details[0].plot_id)
         else:
             self.render('index.html', mode='post',
                    details=details)
diff --git a/lib/d2/app/controllers/svg_text.py b/lib/d2/app/controllers/svg_text.py
index c8d89e0..4ffc5cf 100644
--- a/lib/d2/app/controllers/svg_text.py
+++ b/lib/d2/app/controllers/svg_text.py
@@ -34,7 +34,7 @@ class SvgTextController(BaseController):
             occupant_record = self._db.session.query(Occupant).filter(
                     "occupant_id=:occupant_id").params(
                     occupant_id=forge_record.occupant_id).first()
-            details = detail_adapter.occupant_details(forge_record.occupant_id)
+            details = detail_adapter.details(None, forge_record.occupant_id)
             if details:
                 label = details.label
                 coordinate = self._db.session.query(LabelCoordinate).filter(
diff --git a/lib/d2/bin/d2_server.py b/lib/d2/bin/d2_server.py
index fbe4741..2321263 100644
--- a/lib/d2/bin/d2_server.py
+++ b/lib/d2/bin/d2_server.py
@@ -19,7 +19,9 @@ def main():
     }
     application = tornado.web.Application([
         (r"/svg_text/(.*)", SvgTextController, extras),
-        (r"/(occupant|plot)/(.*)", IndexController, extras),
+        (r"/(plot)/(.*)", IndexController, extras),
+        (r"/(occupant)/(.*)/(plot)/(.*)", IndexController, extras),
+        (r"/(occupant)/(.*)", IndexController, extras),
         (r"/", IndexController, extras),
     ], **settings)
     http_server = tornado.httpserver.HTTPServer(application)
diff --git a/templates/index.html b/templates/index.html
index 8ec15c8..43bd556 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -129,10 +129,18 @@
         Found:
         {% for detail in details %}
             <ul id="result-list">
-                {% if detail.id_type == u'occupant' %}
-                  <li><a href="/occupant/{{detail.id}}">{{detail.label}}</a></li>
+                {% if detail.occupant_id %}
+                    {% if detail.plot_id %}
+                        <li><a href="/occupant/{{detail.occupant_id}}/plot/{{detail.plot_id}}">{{detail.label}}</a>{{detail.description}}</li>
+                    {% else %}
+                        <li><a href="/occupant/{{detail.occupant_id}}">{{detail.label}}</a>{{detail.description}}</li>
+                    {% end %}
                 {% else %}
-                  <li><a href="/plot/{{detail.id}}">{{detail.label}} </a></li>
+                    {% if detail.plot_id %}
+                        <li><a href="/plot/{{detail.plot_id}}">{{detail.label}}</a>{{detail.description}}</li>
+                    {% else %}
+                        <li>{{detail.label}} {{detail.description}}</li>
+                    {% end %}
                 {% end %}
             </ul>
         {% end %}