Commit graph

3225 commits

Author SHA1 Message Date
j2blake
f3d6e33a01 Merge 9428 from 1.4 maint branch 2011-12-15 20:43:15 +00:00
stellamit
77c49f7c65 merge for NIHVIVO-3511 2011-12-15 17:42:40 +00:00
brianjlowe
5966c5e945 NIHVIVO-3510 fixed bugs introduced in updating sparql query builder to generate prefixes 2011-12-15 17:36:37 +00:00
brianjlowe
6a8c434a84 NIHVIVO-3510 modified sparql query builder to manufacture prefixes for any namespaces that need them 2011-12-15 15:08:17 +00:00
brianjlowe
4b8f9c613d NIHVIVO-3513 fixes bug where model list wasn't showing after loading RDF in ingest tools 2011-12-14 22:45:39 +00:00
brianjlowe
6147a54dc3 NIHVIVO-3512 added inference rebuild and scratchpad models to assertions-only filter block 2011-12-14 22:22:57 +00:00
briancaruso
96f172d52b Merging 9412 9377 and 9372 from vitro 1.4 branch 2011-12-14 22:16:23 +00:00
brianjlowe
a30e1d5842 NIHVIVO-3510 fix to sparql query builder to work with empty Vitro 2011-12-14 21:31:46 +00:00
brianjlowe
7e6ea50d63 NIHVIVO-3507 fix to prevent ConversionExceptions when attempting to retrieve equivalent classes for classes not typed as owl:Class 2011-12-14 19:47:10 +00:00
brianjlowe
951dfe9d2c NIHVIVO-3506 removed some old calls to printStackTrace() 2011-12-14 18:57:14 +00:00
brianjlowe
a16f504315 NIHVIVO-3504 improved retrieval of display rank values for class and property groups 2011-12-14 18:15:46 +00:00
brianjlowe
83b2ca3720 NIHVIVO-3498 modified VClassDaoJena.getRootClasses() to not return null; processing imports closure on ontology upload 2011-12-14 16:53:18 +00:00
hjkhjk54
02304f6bb8 updating for NIHVIVO-3494
"Add RDF leads to null pointer exception in certain cases". Including check for null to avoid null pointer exception.
2011-12-13 19:20:23 +00:00
stellamit
9f39bdb4e6 merging changes from 14 branch 2011-12-12 17:24:20 +00:00
brianjlowe
549d489bac NIHVIVO-3481 fixed 'create classgroups automatically' option 2011-12-12 16:48:50 +00:00
briancaruso
55d1f7c5c7 VClassGroupCache will not prevent startup of system when Solr is down
Fixed bug with VClassGroupCache retry when Solr is down. NIHVIVO-3462
2011-12-09 00:45:14 +00:00
j2blake
4acb4ccf7e NIHVIVO-3454 Refine SolrSmokeTest. If the initial connection succeeds, try a 'ping' to the Solr server. 2011-12-08 22:39:41 +00:00
briancaruso
7ee7aedc2b Making rebuild class group from site admin page synchronous NIHVIVO-3461 2011-12-08 22:30:35 +00:00
hjkhjk54
6c9f87b163 updating comment in select list generator as now sorting all lists, even hard-coded ones in edit configuration template 2011-12-08 22:19:00 +00:00
briancaruso
cf31ff4548 Fixing NPE in VClassGroupCache at startup with empty Solr NIHVIVO-3460 2011-12-08 21:50:05 +00:00
hjkhjk54
0cf492d729 updating to make sure sorted list actually gets assigned to the variable sent back to the template 2011-12-08 21:49:04 +00:00
brianjlowe
c7b6e7a75e minor log message tweaks 2011-12-08 21:44:29 +00:00
j2blake
a5c0758371 NIHVIVO-3454 Refine SolrSmokeTest. Produce better messages for Socket Timeout, Unknown host, or Connection Refused (wrong port). On non-fatal errors (status 400 or 404), try three times before giving up. 2011-12-08 21:41:01 +00:00
briancaruso
d8615fd1f5 VClassGroupCache now updates when search index is changed NIHVIVO-3455 NIHVIVO-3458 2011-12-08 21:22:32 +00:00
briancaruso
52c3838b44 Fixing problem with VClassGroupCache creation NIHVIVO-3453.
Removing log message on IndexBuilder because of slf4j on shutdown problem
2011-12-08 19:57:45 +00:00
hjkhjk54
c7303bb623 updates to vclassgroupCache to set individual count of classgroup without adding the counts of the classes in the classgroup but instead getting the results numFound. For NIHVIVO-3456 2011-12-08 19:47:46 +00:00
briancaruso
8cf98a75fa Changing solr analysis for name, NIHVIVO-3332. Attempting to remove duplicate strings due to copy fields in Solr index. 2011-12-08 18:40:49 +00:00
briancaruso
cdd44ee41d Attempting to prevent slf4j errors on shutdown. 2011-12-08 18:38:25 +00:00
brianjlowe
a5f01425ef changed some tabs to spaces to improve svn web view 2011-12-08 15:25:50 +00:00
briancaruso
d6ccf18955 Changing the way the VClassGroupCache gets built. It now uses the solr index instead of the DAOs. NIHVIVO-3449 2011-12-08 00:31:24 +00:00
stellamit
14c43196c3 NIHVIVO-3447 display model migration 2011-12-07 22:16:07 +00:00
brianjlowe
fb008e7410 NIHVIVO-3452 SPARQL 1.1 for SPARQL page and ingest tools 2011-12-07 22:03:13 +00:00
j2blake
c800d0c877 Read to a stream instead of a String, to remove a warning message. 2011-12-07 21:43:42 +00:00
brianjlowe
46a1fa669b minor source formatting tweaks 2011-12-07 19:45:17 +00:00
brianjlowe
ae85e5c648 NIHVIVO-3440 rework of db connection management for VitroJenaSDBModelMaker 2011-12-07 18:48:47 +00:00
hjkhjk54
989f0d9f97 updates to help with autocomplete 2011-12-07 14:42:10 +00:00
briancaruso
12fbb1a984 Adding debug message on predicate skip in EditRquestDispatchController 2011-12-06 16:28:37 +00:00
hjkhjk54
78607710de handling the case where list of literals include nulls (this happens for date/time literals when the field is not filled in) 2011-12-06 16:17:37 +00:00
briancaruso
36a99486f6 Adding anti XSS NIHVIVO-3379 2011-12-05 22:08:04 +00:00
hjkhjk54
dac5d91478 updating to ensure default namespace is null (to be consistent with the vivo version and the other calls where null denotes default namespace for the edit configuration) 2011-12-05 21:51:01 +00:00
hjkhjk54
48c8a73613 committing beginnings of autocomplete form and changes 2011-12-05 21:35:39 +00:00
hjkhjk54
d1b17c75d1 updates to enable delete to work even if no statement information is being passed in the parameters 2011-12-05 21:27:14 +00:00
brianjlowe
7d91949ebe removed duplicated code from JenaCsv2RdfController.java 2011-12-05 20:52:27 +00:00
brianjlowe
2929e3228c NIHVIVO-3435 re-setting processImports(false) 2011-12-05 20:36:39 +00:00
brianjlowe
672d9e6457 NIHVIVO-3432 refactor access to model makers in ingest tools 2011-12-05 20:13:37 +00:00
hjkhjk54
820cf314b5 updates to date time interval forms to get edit mode based not on front end editing utils but whether or not object uri present, also updated primitive rdf edit to enable concept page to remove relationships inspite of vivo policy's restriction on "delete" actions on those properties 2011-12-05 19:21:38 +00:00
brianjlowe
654f5b6efb NIHVIVO-3428 removed sort fields from object property editing form 2011-12-05 16:38:53 +00:00
hjkhjk54
5b73abf962 adding debugging to edit mode utils 2011-12-02 22:24:50 +00:00
j2blake
704e317686 fix spelling error 2011-12-02 21:29:25 +00:00
brianjlowe
eee41106a1 NIHVIVO-3396 removed code related to individualSortField 2011-12-02 21:12:13 +00:00