diff --git a/browser/document.pt b/browser/document.pt index a285fd5..7fca570 100644 --- a/browser/document.pt +++ b/browser/document.pt @@ -4,10 +4,14 @@ - + - +

Title

+
+ The body +
diff --git a/browser/form.py b/browser/form.py index e54fc0a..8b2c6e4 100644 --- a/browser/form.py +++ b/browser/form.py @@ -17,7 +17,7 @@ # """ -View class for Node objects. +Classes for form presentation and processing. $Id$ """ @@ -58,4 +58,21 @@ class CreateObjectForm(NodeView, Form): class CreateObject(FormController): def update(self): + prefix = 'form.' + form = self.request.form print 'updating...' + # determine name + # create object, assign basic concepts (type, ...) + for k in form.keys(): + if k.startswith(prefix): + fn = k[len(prefix):] + value = form[k] + if fn.startswith('concept.search.'): + self.assignConcepts(fn, value) + else: + pass + #setattr(obj, fn, value) + print fn, value + + def assignConcepts(self, fieldName, value): + pass diff --git a/browser/node_macros.pt b/browser/node_macros.pt index e381b8f..cb20d27 100644 --- a/browser/node_macros.pt +++ b/browser/node_macros.pt @@ -46,7 +46,8 @@
@@ -205,7 +206,7 @@
- Create Resource... diff --git a/browser/resource_macros.pt b/browser/resource_macros.pt index b8d7928..72ad251 100644 --- a/browser/resource_macros.pt +++ b/browser/resource_macros.pt @@ -4,7 +4,7 @@ + item nocall:node|nocall:view;">
>> from cybertools.relation.interfaces import IRelationRegistry >>> from cybertools.relation.registry import DummyRelationRegistry + >>> from cybertools.relation.tests import IntIdsStub >>> relations = DummyRelationRegistry() - >>> component.provideUtility(relations, IRelationRegistry) + >>> component.provideUtility(relations) + >>> component.provideUtility(IntIdsStub()) >>> from loops.type import ConceptType, TypeConcept >>> from loops.interfaces import ITypeConcept @@ -170,7 +171,7 @@ Now we can fill our search form and execute the query; note that all concepts found are listed, plus all their children and all resources associated with them: - >>> form = {'search.3.type': 'loops:concept:topic', 'search.3.text_selected': u'zope'} + >>> form = {'search.3.type': 'loops:concept:topic', 'search.3.text': u'zope'} >>> request = TestRequest(form=form) >>> resultsView = SearchResults(page, request) >>> results = list(resultsView.results) @@ -179,7 +180,7 @@ with them: >>> results[0].context.__name__ u'plone' - >>> form = {'search.3.type': 'loops:concept:topic', 'search.3.text_selected': u'zope3'} + >>> form = {'search.3.type': 'loops:concept:topic', 'search.3.text': u'zope3'} >>> request = TestRequest(form=form) >>> resultsView = SearchResults(page, request) >>> results = list(resultsView.results) @@ -192,6 +193,12 @@ To support easy entry of concepts to search for we can preselect the available concepts (optionally restricted to a certain type) by entering text parts of the concepts' titles: -TODO... + >>> form = {'searchType': 'loops:concept:topic', 'searchString': u'zo'} + >>> request = TestRequest(form=form) + >>> view = Search(page, request) + >>> view.listConcepts() + '[]' + +TODO - more to come... diff --git a/search/browser.py b/search/browser.py index c6d7376..dbbec1d 100644 --- a/search/browser.py +++ b/search/browser.py @@ -31,6 +31,7 @@ from zope.formlib.namedtemplate import NamedTemplate, NamedTemplateImplementatio from zope.i18nmessageid import MessageFactory from cybertools.ajax import innerHtml +from cybertools.relation.interfaces import IRelationRegistry from cybertools.typology.interfaces import ITypeManager from loops.browser.common import BaseView from loops.query import ConceptQuery, FullQuery @@ -77,9 +78,14 @@ class Search(BaseView): title = request.get('searchString', '').replace('(', ' ').replace(')', ' ') type = request.get('searchType') or 'loops:concept:*' result = ConceptQuery(self).query(title=title, type=type) + registry = component.getUtility(IRelationRegistry) # simple way to provide JSON format: - return str(sorted([[`o.title`[2:-1], `traversing.api.getName(o)`[2:-1]] - for o in result])).replace('\\\\x', '\\x') + return str(sorted([[`o.title`[2:-1], + `registry.getUniqueIdForObject(o)`] + for o in result + if o.getLoopsRoot() == self.loopsRoot])).replace('\\\\x', '\\x') + #return str(sorted([[`o.title`[2:-1], `traversing.api.getName(o)`[2:-1]] + # for o in result])).replace('\\\\x', '\\x') def submitReplacing(self, targetId, formId, view): self.registerDojo() @@ -106,10 +112,12 @@ class SearchResults(BaseView): useTitle = request.get('search.2.title') useFull = request.get('search.2.full') conceptType = request.get('search.3.type', 'loops:concept:*') - conceptTitle = request.get('search.3.text_selected') + conceptTitle = request.get('search.3.text') + conceptUid = request.get('search.3.text_selected') result = FullQuery(self).query(text=text, type=type, useTitle=useTitle, useFull=useFull, - conceptTitle=conceptTitle, conceptType= conceptType) + conceptTitle=conceptTitle, conceptUid=conceptUid, + conceptType= conceptType) result = sorted(result, key=lambda x: x.title.lower()) return self.viewIterator(result)