Add status to loans/libraries view.

openlibrary · Jun 8, 2011 · 9f68941 · 9f68941
1 parent 248a7a5
commit 9f68941
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/couchapps/admin/loans/views/libraries/map.py b/couchapps/admin/loans/views/libraries/map.py
@@ -1,4 +1,5 @@
 def _map(doc):
     lib = doc.get("library")
+    status = doc.get("status")
     if lib:
-        yield lib, 1
+        yield [lib, status], 1
diff --git a/openlibrary/plugins/openlibrary/libraries.py b/openlibrary/plugins/openlibrary/libraries.py
@@ -315,9 +315,11 @@ def get_loans_per_user(self, key="", limit=1):
         return [[row.key[-1], row.value] for row in rows if row.value >= limit]
 
     def get_loans_per_library(self):
-        rows = self.view("loans/libraries", group=True).rows
+        # view contains:
+        #   [lib_key, status], 1
+        rows = self.view("loans/libraries", group=True, group_level=1).rows
         names = self._get_library_names()
-        return [[names.get(row.key, "-"), row.value] for row in rows]
+        return [[names.get(row.key[0], "-"), row.value] for row in rows]
 
     def _get_library_names(self):
         return dict((lib.key, lib.name) for lib in inlibrary.get_libraries())