Commit graph

6267 commits

Author SHA1 Message Date
Jim Blake
c7979c05a7 VIVO-1018 RiotReader.createIteratorTriples() assumes an ASCII stream, so we need a different method. 2015-04-22 15:34:06 -04:00
Jim Blake
570cd78667 VIVO-1022 Correct licenser for example ORNG gadgets. 2015-04-21 16:42:24 -04:00
Jim Blake
b26d824cb2 VIVO-1022 Load ORNG sample gadgets from the local server, not from UCSF 2015-04-21 16:18:15 -04:00
Jim Blake
c623e32cff VIVO-1017 Fix stupid mistake from VIVO-1015
When the variables were given meaningful names, it became obvious that I was checking
the wrong one to see whether it was a faux property.
2015-04-15 11:13:27 -04:00
Jim Blake
c8eca40385 VIVO-1015 fix the redundancy check for restricted properties.
Now that we have faux properties, we consider two object properties to be different if they have different ranges.
However, an object property with a restriction appears to have a different range from its base property, but is
considered to be the same property. Fix this.
2015-04-13 16:25:25 -04:00
Jim Blake
dc726d2600 VIVO-1016 Avoid crashing on ABox.isEmpty()
1) Don't ask whether the ABox is empty, if you don't need to
2) If you must ask, ask the graph of the base model, to avoid SDB layers
3) change contains() to use SELECT instead of ASK, because SDB implements ASK very poorly.
2015-04-13 10:25:58 -04:00
Tim Worrall
d8aaecd4fd No Jira issue. Fixed a null pointer exception when I data property has no rangeDatatypeUri. 2015-04-08 16:15:59 -04:00
Tim Worrall
e442dbd7cc No Jira issue. Added a check in the event there are datatypes defined for other than xsd. 2015-04-08 15:51:10 -04:00
tworrall
6cc12c239e Merge pull request #20 from nateprewitt/fix/jquery-protocol
changed jquery imports to be protocol relative so they don't fail on HTT...
2015-04-08 10:30:52 -04:00
Nate Prewitt
ad5e6fa920 changed jquery imports to be protocol relative so they don't fail on HTTPS sites 2015-04-07 13:11:17 -06:00
Tim Worrall
0c5d69e25e Related to VIVO-921. Server-side validation for default data property form. 2015-04-07 14:00:30 -04:00
Tim Worrall
a32ee20a40 VIVO-921: some additional validation work as well as dislaying an indicator when a data property has been ingested in an invalid format. 2015-04-06 14:48:05 -04:00
Jim Blake
ced99d7703 Improve some error handling to clean up the catalina log. 2015-04-02 17:05:47 -04:00
Jim Blake
6aa29378e5 No Jira issue. Print a better message when a SPARQL Query won't parse. 2015-04-01 18:07:07 -04:00
Tim Worrall
749a8ff8ad VIVO-921: tweaked the regular expressions 2015-04-01 13:36:53 -04:00
Tim Worrall
c47964fbde VIVO-921: widget-ized the data property form. Dates, ints, integers, floats, uris and booleans no longer use tinyMCE. 2015-04-01 12:48:15 -04:00
Jim Blake
c69138b737 VIVO-1009 Tweak the handling of TDB transactions. 2015-03-31 17:38:53 -04:00
Jim Blake
12ccf8ed9e VIVO-1008 Refine the mime type: if no extension, then HTML
When behind Apache, some HTML pages were coming out as text/plain
2015-03-31 13:30:04 -04:00
Jim Blake
afde710d9a Merge branch 'develop' of git+ssh://github.com/vivo-project/Vitro into develop 2015-03-30 16:36:33 -04:00
Jim Blake
b0b6e9dbc9 VIVO-1009 Use ModelMakerWithPersistenEmptyModels so new models show up.
With ListCachingModelMaker, the filegraph models did not show up until you started VIVO for a second time.
Also, models that you create by the SPARQL Update API are not evident until restarting.
This fixes that.
2015-03-30 16:36:11 -04:00
hudajkhan
0e54b7bb43 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2015-03-30 16:24:29 -04:00
hudajkhan
a133ed206e Enabling more general exception to be logged and caught in makeIndividual method 2015-03-30 16:24:12 -04:00
Jim Blake
abf3d00996 VIVO-1009 Apply the UNION content models at the proper level.
The ContentTripleSourceTDB and ContentTripleSourceSPARQL need to have union models on the
short-term OntModelCache. But they shouldn't be required to add them. They should be added to the
long-term OntModelCache and let ContentTripleSourceSDB override them when it overrides the long-term models.
2015-03-30 13:47:31 -04:00
Jim Blake
6981838348 VIVO-1009 Rely less on JenaDataSourceSetupBase.isFirstStartup()
In general, we can read firsttime files iff a model is empty. This provides more flexibility than relying on isFirstStartup().
However, the KnowledgeBaseUpdater still relies on isFirstStartup(), so we need to be sure that we set it when appropriate.
2015-03-30 11:40:02 -04:00
Jim Blake
0362770961 VIVO-1009 TDB is based on transactions. Handle them correctly. 2015-03-30 11:01:07 -04:00
Tim Worrall
0a78ab5687 VIVO-919 and VIVO-1007: added the max password length to login widget class and also corrected the variable reference in the template for the minimum length (was minimumLength not minimumPasswordLength). 2015-03-27 16:05:42 -04:00
Jim Blake
8e429ca878 VIVO-1008 Don't override the mime type if the servlet container can provide it.
In CharsetEncodingFilter, check to see whether the servlet container knows the mime type,
before forcing it to "text/html;charset=UTF-8"
2015-03-27 15:38:38 -04:00
Jim Blake
a71f05d2f0 Merge branch 'develop' of git+ssh://github.com/vivo-project/Vitro into develop 2015-03-25 15:13:04 -04:00
Jim Blake
94c190896e VIVO-941 Add debug statements and clean up compiler warnings. 2015-03-25 15:12:50 -04:00
Tim Worrall
860ca32096 VIVO-1007: 18n string in login widget only referenced when variable rather than two. 2015-03-25 15:10:30 -04:00
Jim Blake
f389d320ed VIVO-898 Call removedStatements.add(), not removedStatements.remove()
Also, in RefactorOperationController, edit events must be fired against the base model, not against the ontModel itself.
Also, add some debugging statements.
2015-03-24 12:21:51 -04:00
Tim Worrall
ba56c3de06 No Jira issue. Removed superfluous colon from the end of a message. 2015-03-23 10:49:36 -04:00
Jim Blake
cf5a56d8e8 VIVO-1004 Treat an accept header of application/ld+json as equivalent to application/json
This is a minimal fix. It doesn't take related issues into account. It also doesn't attempt to
clean up the logic in IndividualController, or to deal with the fact that much of this logic is
repeated around the application.
2015-03-20 17:21:08 -04:00
Jim Blake
a909cda3ee Merge branch 'develop' of git+ssh://github.com/vivo-project/Vitro into develop 2015-03-20 15:37:11 -04:00
Jim Blake
5476ba66e1 V IVO-989 Don't show a property twice just because its range is a blank node. 2015-03-20 15:37:03 -04:00
Jim Blake
abea644f46 Ignore markdown files in RDF directories.
People want to document the RDF directories (such as rdf/abox/filegraph) by adding README.md files
Such files produce either a warning or an exception, depending on the directory and who is reading.
Modify to ignore any file with a .md extension.
2015-03-20 15:34:53 -04:00
Tim Worrall
8f7a9beea5 class hierarchy was throwing a null pointer exception when the all classes option was selected 2015-03-20 15:33:22 -04:00
Tim Worrall
ed0b7f0f0d VIVO-998: the label will no longer be rendered on the page, leaving the name field. 2015-03-19 12:49:55 -04:00
Tim Worrall
4e09f96548 VIVO-999: when showing the list of classes that have a restriction on a property, hide the display option select and add class button. When no classes, diplay a message to tht effect. 2015-03-17 16:47:53 -04:00
Tim Worrall
f078bc4931 VIVO-970: language changes that coincide with the previous js change. 2015-03-16 13:01:05 -04:00
Tim Worrall
61e95b7d4e VIVO-970: add display limit to the object property control panel 2015-03-16 11:42:29 -04:00
Tim Worrall
5664be4a43 VIVO-970: needed to break out the more/less javascript toggle into a separate file. 2015-03-16 11:02:33 -04:00
Jim Blake
4b0cdadb0d VIVO-958 Accommodate a migration directly from 1.5 data to 1.8
Move data directory from ontologies/update to version-specific directory ontologies/update17to18
Create ontologies/update15to16 and ontologies/update16to17 from previous update data directories.

Revise UpdateKnowledgeBase to accept the data directory as a parameter instead of having it hard-coded.
Create classes like Release18Migrator that will call UpdateKnowledgeBase with the appropriate directory, and do other release-specific migration tasks.

Make corresponding changes in startup_listeners.txt
2015-03-13 12:15:25 -04:00
Tim Worrall
d6a17ef0b6 No Jira issue. Minor 18n change: moved an entry from vivo to vitro and modified an existing entry. 2015-03-11 15:25:35 -04:00
Jim Blake
f29b8c781a Correct a copy/paste error in static utility method. Also, add another utility method. 2015-03-10 13:30:53 -04:00
Jim Blake
e818f1ab24 VIVO-986 Limit the concatenation of string values to ALLTEXT and ALLTEXTUNSTEMMED 2015-03-09 16:32:12 -04:00
Jim Blake
32979536e6 VIVO-987 Properly shutdown the TripleSource instances.
When shutting down a ContentTripleSourceSDB instance, attempt to deregister the JDBC driver.
Also, attempt to shut down the AbandonedConnectionCleanupThread.
Each of these produce warning messages if not shut down.
2015-03-09 16:01:48 -04:00
Jim Blake
3b57db938f VIVO-986 Concatenate string values in search records for better snippets.
Concatenated values are separated by a single space. Non-string values are not affected.
2015-03-09 12:11:44 -04:00
Jim Blake
37a08c5dcf VIVO-976 The property is appearing twice in the list - remove one of them.
For some reason, the property shows up once with a domain of OWL:Thing, and once with a domain of a blank node.
Treat them as equivalent and the problem disappears.
2015-03-04 14:36:31 -05:00
Jim Blake
e3859b7863 ContentTripleSourceVirtuoso does not inherit annotated methods. 2015-03-02 16:24:58 -05:00