Changeset 0492ba in indico

Timestamp:

03/14/11 16:40:46 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

d0e066

Parents:

336214

Message:

[IMP] Adapted invenioSEA to new invenio layout

Location:

indico/MaKaC/search

Files:

• base.py (modified) (2 diffs)
• invenioSEA.py (modified) (2 diffs)

indico/MaKaC/search/base.py

@@ -107 +107 @@
     def create(cls, id, title, location, startDate, materials, authors, description):
         
-        regexp = r'^INDICO\.\w(\w+)(\.(\w+)(\.(\w)+)?)?$'
+        regexp = r'^INDICO\.(\w+)(\.(\w+)(\.(\w)+)?)?$'
 
         m = re.match(regexp, str(id))
@@ -129 +129 @@
 
         self._parent = parent
-
-        materials.append((urlHandlers.UHConferenceDisplay.getURL(confId=parent), 'Event details'))
 
     def getConferenceId(self):

indico/MaKaC/search/invenioSEA.py

@@ -160 +160 @@
 
             # search for event identifier
-            self._marcQuery = 'AND (970__:"INDICO.p%s*" OR 970__:"INDICO.r%s*")' % (target.getId(), target.getId())
+            self._marcQuery = 'AND 970__:"INDICO.%s*"' % (target.getId(), target.getId())
             self._searchCategories = False
 
@@ -220 +220 @@
         return field
 
-    @SEATranslator ('collections',[],'c')
+    @SEATranslator ('collections',[],('c', 'p'))
     def translateCollection(self, collection):
 
+        if collection == 'Events':
+            query = "AND 65027a:'*'"
+        else:
+            query = "AND 65027a:"
+
         if self._private:
-            repository = 'INDICOSEARCH'
-        else:
-            repository = 'INDICOPUBLIC'
-
-        if collection == 'Events':
-            return '%s.events' % repository
-        elif collection == 'Contributions':
-            return '%s.contribs' % repository
+            return ('INDICOSEARCH', query)
+        else:
+            return ('INDICOSEARCH.PUBLIC', query)
+
 
     @SEATranslator ('startRecord',[],'jrec')