data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
Holger Knublauch
a717a7a5 2 parents 001c6bd1 faa64c91

EPIM log search progress

Expand all
Inline Side-by-side
Showing 6 changed files with 29 additions and 27 deletions
This diff is collapsed. Click to expand it.
...@@ -148,8 +148,8 @@ a:active.appFormHeaderLink { ...@@ -148,8 +148,8 @@ a:active.appFormHeaderLink {
148 background-color: darkGray; 148 background-color: darkGray;
149 color: white; 149 color: white;
150 padding-left: 4px; 150 padding-left: 4px;
151 - padding-top: 1px; 151 + padding-top: 2px;
152 - padding-bottom: 1px; 152 + padding-bottom: 2px;
153 padding-right: 4px; 153 padding-right: 4px;
154 } 154 }
155 155
......
...@@ -185,17 +185,19 @@ function appLoadEditForm(parentId, resourceType) { ...@@ -185,17 +185,19 @@ function appLoadEditForm(parentId, resourceType) {
185 * @param oldElementId the id of the element to replace - this will be the id of the new form. 185 * @param oldElementId the id of the element to replace - this will be the id of the new form.
186 * @param resultsId the id of the element to display the search results 186 * @param resultsId the id of the element to display the search results
187 * @param resourceTypeURI the type of resources to search for 187 * @param resourceTypeURI the type of resources to search for
188 - * @param queryGraphURI the query graph URI 188 + * @param queryGraphURI the (instance) query graph URI
189 + * @param schemaGraphURI the URI of the schema graph
189 * @param noBorder (optional) to suppress the border 190 * @param noBorder (optional) to suppress the border
190 */ 191 */
191 -function appLoadSearchForm(oldElementId, resultsId, resourceTypeURI, queryGraphURI, noBorder) { 192 +function appLoadSearchForm(oldElementId, resultsId, resourceTypeURI, queryGraphURI, schemaGraphURI, noBorder) {
192 var data = { 193 var data = {
193 - formId: oldElementId, 194 + formId : oldElementId,
194 - resourceType: '<' + resourceTypeURI + '>', 195 + resourceType : '<' + resourceTypeURI + '>',
195 - resultsId: resultsId, 196 + resultsId : resultsId,
196 - _base : '<' + queryGraphURI + '>', 197 + queryGraph : '<' + queryGraphURI + '>',
197 - _viewClass: 'app:SearchForm', 198 + _base : '<' + schemaGraphURI + '>',
198 - _snippet: true 199 + _viewClass : 'app:SearchForm',
200 + _snippet : true
199 }; 201 };
200 if(noBorder) { 202 if(noBorder) {
201 data.noBorder = true; 203 data.noBorder = true;
...@@ -211,15 +213,13 @@ function appLoadSearchForm(oldElementId, resultsId, resourceTypeURI, queryGraphU ...@@ -211,15 +213,13 @@ function appLoadSearchForm(oldElementId, resultsId, resourceTypeURI, queryGraphU
211 * a given id. Will replace the content of a given target element. 213 * a given id. Will replace the content of a given target element.
212 * @param formId the form id 214 * @param formId the form id
213 * @param targetId the target id 215 * @param targetId the target id
214 - * @param queryGraphURI the current query graph
215 * @returns false 216 * @returns false
216 */ 217 */
217 -function appLoadSearchResultsGrid(formId, targetId, queryGraphURI) { 218 +function appLoadSearchResultsGrid(formId, targetId) {
218 var params = $('#' + formId).serialize(); 219 var params = $('#' + formId).serialize();
219 var escaped = '&params=' + escape(params); 220 var escaped = '&params=' + escape(params);
220 $.get(uispinServlet + '?_viewClass=app:SearchResultsGrid&_snippet=true&' + 221 $.get(uispinServlet + '?_viewClass=app:SearchResultsGrid&_snippet=true&' +
221 - '_base=' + escape('<' + queryGraphURI + '>') + 222 + params + escaped, function(data) {
222 - '&' + params + escaped, function(data) {
223 $('#' + targetId).html(data); 223 $('#' + targetId).html(data);
224 }); 224 });
225 return false; 225 return false;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 SELECT ?colName 14 SELECT ?colName
15 WHERE { 15 WHERE {
16 GRAPH ui:graph { 16 GRAPH ui:graph {
17 - ?keyProperties (rdf:rest*)/rdf:first ?keyProperty . 17 + ?keyProperties list:member ?keyProperty .
18 BIND (spif:titleCase(ui:label(?keyProperty)) AS ?colName) . 18 BIND (spif:titleCase(ui:label(?keyProperty)) AS ?colName) .
19 } 19 }
20 } 20 }
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 SELECT ?varName 32 SELECT ?varName
33 WHERE { 33 WHERE {
34 GRAPH ui:graph { 34 GRAPH ui:graph {
35 - ?keyProperties (rdf:rest*)/rdf:first ?property . 35 + ?keyProperties list:member ?property .
36 BIND (app:keyPropertyVarName(?property) AS ?varName) . 36 BIND (app:keyPropertyVarName(?property) AS ?varName) .
37 } 37 }
38 } 38 }
......
1 -# baseURI: http://www.reportinghub.no/examples/system/exampleLogEvents 1 +# baseURI: http://www.reportinghub.no/graph/logging
2 # imports: http://www.reportinghub.no/system/schema/logging 2 # imports: http://www.reportinghub.no/system/schema/logging
3 3
4 -@prefix : <http://www.reportinghub.no/examples/system/exampleLogEvents#> . 4 +@prefix : <http://www.reportinghub.no/graph/logging#> .
5 @prefix dcterms: <http://purl.org/dc/terms/> . 5 @prefix dcterms: <http://purl.org/dc/terms/> .
6 @prefix log: <http://www.reportinghub.no/system/schema/logging#> . 6 @prefix log: <http://www.reportinghub.no/system/schema/logging#> .
7 @prefix owl: <http://www.w3.org/2002/07/owl#> . 7 @prefix owl: <http://www.w3.org/2002/07/owl#> .
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 @prefix sioc: <http://rdfs.org/sioc/ns#> . 11 @prefix sioc: <http://rdfs.org/sioc/ns#> .
12 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 12 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
13 13
14 -<http://www.reportinghub.no/examples/system/exampleLogEvents> 14 +<http://www.reportinghub.no/graph/logging>
15 rdf:type owl:Ontology ; 15 rdf:type owl:Ontology ;
16 owl:imports <http://www.reportinghub.no/system/schema/logging> ; 16 owl:imports <http://www.reportinghub.no/system/schema/logging> ;
17 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 17 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
......
...@@ -22,16 +22,18 @@ ...@@ -22,16 +22,18 @@
22 log:LogBrowser 22 log:LogBrowser
23 rdf:type ui:NodeClass ; 23 rdf:type ui:NodeClass ;
24 rdfs:comment "A complex element with a tree of log event classes in the upper left corner, a search form in the upper center area, and a grid of results in the main center area."^^xsd:string ; 24 rdfs:comment "A complex element with a tree of log event classes in the upper left corner, a search form in the upper center area, and a grid of results in the main center area."^^xsd:string ;
25 - rdfs:label "Log browser"^^xsd:string ; 25 + rdfs:label "Log Browser"^^xsd:string ;
26 rdfs:subClassOf ui:Element ; 26 rdfs:subClassOf ui:Element ;
27 ui:prototype 27 ui:prototype
28 [ rdf:type html:Div ; 28 [ rdf:type html:Div ;
29 - html:style "width:950px"^^xsd:string ; 29 + html:style "width:900px"^^xsd:string ;
30 ui:child 30 ui:child
31 [ rdf:type app:VSplitLayout ; 31 [ rdf:type app:VSplitLayout ;
32 arg:height "500px"^^xsd:string ; 32 arg:height "500px"^^xsd:string ;
33 arg:topHeight "30%"^^xsd:string ; 33 arg:topHeight "30%"^^xsd:string ;
34 ui:child 34 ui:child
35 + [ rdf:type ui:setContext ;
36 + ui:child
35 [ rdf:type app:HSplitLayout ; 37 [ rdf:type app:HSplitLayout ;
36 arg:height "200px"^^xsd:string ; 38 arg:height "200px"^^xsd:string ;
37 ui:child 39 ui:child
...@@ -42,8 +44,6 @@ log:LogBrowser ...@@ -42,8 +44,6 @@ log:LogBrowser
42 ui:childIndex 0 44 ui:childIndex 0
43 ] ; 45 ] ;
44 ui:child 46 ui:child
45 - [ rdf:type ui:setContext ;
46 - ui:child
47 [ rdf:type app:Tree ; 47 [ rdf:type app:Tree ;
48 arg:dataProvider log:LogEventClassTreeDataProvider ; 48 arg:dataProvider log:LogEventClassTreeDataProvider ;
49 arg:id "classTree"^^xsd:string ; 49 arg:id "classTree"^^xsd:string ;
...@@ -51,14 +51,12 @@ log:LogBrowser ...@@ -51,14 +51,12 @@ log:LogBrowser
51 [ rdf:type app:createLoadSearchFormCall ; 51 [ rdf:type app:createLoadSearchFormCall ;
52 arg:noBorder "true"^^xsd:boolean ; 52 arg:noBorder "true"^^xsd:boolean ;
53 arg:oldElementId "searchForm" ; 53 arg:oldElementId "searchForm" ;
54 + arg:queryGraph <http://www.reportinghub.no/graph/logging> ;
54 arg:resourceTypeCode 55 arg:resourceTypeCode
55 "resource" ; 56 "resource" ;
56 arg:resultsId "results" 57 arg:resultsId "results"
57 ] ; 58 ] ;
58 - ui:childIndex 0 59 + ui:childIndex 1
59 - ] ;
60 - ui:childIndex 1 ;
61 - ui:queryGraph <http://www.reportinghub.no/system/schema/logging>
62 ] ; 60 ] ;
63 ui:childIndex 0 61 ui:childIndex 0
64 ] ; 62 ] ;
...@@ -69,6 +67,7 @@ log:LogBrowser ...@@ -69,6 +67,7 @@ log:LogBrowser
69 [ rdf:type app:SearchForm ; 67 [ rdf:type app:SearchForm ;
70 arg:formId "searchForm"^^xsd:string ; 68 arg:formId "searchForm"^^xsd:string ;
71 arg:noBorder "true"^^xsd:boolean ; 69 arg:noBorder "true"^^xsd:boolean ;
70 + arg:queryGraph <http://www.reportinghub.no/graph/logging> ;
72 arg:resourceType log:LogEvent ; 71 arg:resourceType log:LogEvent ;
73 arg:resultsId "results"^^xsd:string ; 72 arg:resultsId "results"^^xsd:string ;
74 ui:childIndex 0 73 ui:childIndex 0
...@@ -77,6 +76,9 @@ log:LogBrowser ...@@ -77,6 +76,9 @@ log:LogBrowser
77 ] ; 76 ] ;
78 ui:childIndex 0 77 ui:childIndex 0
79 ] ; 78 ] ;
79 + ui:childIndex 0 ;
80 + ui:queryGraph <http://www.reportinghub.no/system/schema/logging>
81 + ] ;
80 ui:child 82 ui:child
81 [ rdf:type html:Div ; 83 [ rdf:type html:Div ;
82 ui:child 84 ui:child
......