From 60dfa6711078dbba7449bcea21f4bf702fc02936 Mon Sep 17 00:00:00 2001 From: ejc12 Date: Fri, 14 Jan 2011 22:27:13 +0000 Subject: [PATCH 001/427] The install.html is up2date with the content in index.txt, so I will ask developers to edit install.html instead of install.txt if no outstanding changes. --- doc/install.txt | 530 ------------------------------------------------ 1 file changed, 530 deletions(-) delete mode 100644 doc/install.txt diff --git a/doc/install.txt b/doc/install.txt deleted file mode 100644 index 2deeb1c3..00000000 --- a/doc/install.txt +++ /dev/null @@ -1,530 +0,0 @@ - -------------------------------------------------------------------------------- - -This document is a summary of the VIVO installation process. This and other documentation -can be found at: - - http://vivoweb.org/support - -PLEASE NOTE! -These instructions assume that you are performing a clean install, -including emptying an existing database and removing a previous installation -from the Tomcat webapps directory. Product functionality may not be as expected -if you install over an existing installation of an earlier version. - -Upgrade: -If you are going to upgrade an existing service, please consult the upgrade.txt -in this directory. - -VIVO Developers: -If you are working on the VIVO source code from Subversion, the instructions -are slightly different. Please consult developers.txt in this directory. - -------------------------------------------------------------------------------- - - * I. Install required software - * II. Create an empty MySQL database - * III. Download the VIVO Application Source - * IV. Specify deployment properties - * V. Compile and deploy - * VI. Set Tomcat JVM parameters and security limits - * VII. Start Tomcat - * VIII. Log in and add RDF data - * IX. Set the Contact Email Address (if using "Contact Us" form) - * X. Setup Apache Tomcat Connector - * XI. Configure Pellet Reasoner - * XII. Using an External Authentication System with VIVO - * XIII. Was the installation successful? - -------------------------------------------------------------------------------- - -I. Install required software - -Before installing VIVO, make sure that the following software is installed on -the desired machine: - - * Java (SE) 1.6 or higher [http://java.sun.com] (Not OpenJDK) - * Apache Tomcat 6.x or higher [http://tomcat.apache.org] - * Apache Ant 1.7 or higher [http://ant.apache.org] - * MySQL 5.1 or higher [http://www.mysql.com] - -Be sure to setup the environment variables for "JAVA_HOME" and "ANT_HOME" and -add the executables to your path per your operating system and installation -directions from the software support web sites. - -------------------------------------------------------------------------------- - -II. Create an empty MySQL database - -Decide on a database name, username, and password. Log into your MySQL server -and create a new database in MySQL that uses UTF-8 encoding. You will need -these values for step IV when you configure the deployment properties. At the -MySQL command line you can create the database and user with these commands -substituting your values for "dbname", "username", and "password". Most of the -time, the "hostname" will equal "localhost". - -CREATE DATABASE dbname CHARACTER SET utf8; - -Grant access to a database user. For example: - -GRANT ALL ON dbname.* TO 'username'@'hostname' IDENTIFIED BY 'password'; - -Keep track of the database name, username, and password for Step IV. - -------------------------------------------------------------------------------- - -III. Download the VIVO Application Source - -Download the VIVO application source as either rel-1.1.1.zip or rel-1.1.1.gz file -and unpack it on your web server: - - http://vivoweb.org/download - -------------------------------------------------------------------------------- - -IV. Specify deployment properties - -At the top level of the unpacked distribution, copy the file -example.deploy.properties to a file named simply deploy.properties. This file -sets several properties used in compilation and deployment. - -NOTE: For those installing on Windows operating system, include the windows -drive and use the forward slash "/" and not the back slash "\" in the -directory locations, e.g. "c:/tomcat". - - Default namespace: VIVO installations make their RDF resources available for harvest - using linked data. Requests for RDF resource URIs redirect to HTML - or RDF representations as specified by the client. To make this - possible, VIVO's default namespace must have certain structure and - begin with the public web address of the VIVO installation. - For example, if the web address of a VIVO installation is - http://vivo.example.edu/ the default namespace must be set to - http://vivo.example.edu/individual/ in order to support linked data. - Similarly, if VIVO is installed at http://www.example.edu/vivo the - default namespace must be set to http://www.example.edu/vivo/individual/ - Note: The namespace must end with "individual/" (including the - trailing slash). -property name: Vitro.defaultNamespace -example value: http://vivo.mydomain.edu/individual/ - - Directory where Vitro code is located. In most deployments, - this is set to ./vitro-core, but it commonly points elsewhere - during development. -property name: vitro.core.dir -example value: ./vitro-core - - Directory where tomcat is installed -property name: tomcat.home -example value: /usr/local/tomcat - - Name of your VIVO application -property name: webapp.name -example value: vivo - - Directory where uploaded files will be stored. You must create - this directory ahead of time. -property name: upload.directory -example value: /usr/local/vivo/data/uploads - - Directory where the Lucene search index will be built. - Depending on your permissions and who Tomcat is running as, - you may need to create this directory ahead of time. -property name: LuceneSetup.indexDir -example value: /usr/local/vivo/data/luceneIndex - - Specify an SMTP host that the form will use for sending - e-mail (Optional). If this is left blank, the contact form - will be hidden and disabled. -property name: Vitro.smtpHost -example value: smtp.servername.edu - - Specify the JDBC URL of your database. Change the end of the - URL to reflect your database name (if it is not "vivo"). -property name: VitroConnection.DataSource.url -example value: jdbc:mysql://localhost/vivo - - Change the username to match the authorized user you created in MySQL -property name: VitroConnection.DataSource.username -example value: username - - Change the password to match the password you created in MySQL -property name: VitroConnection.DataSource.password -example value: password - - Specify the Jena triple store technology to use. SDB is Jena's - SPARQL database; this setting allows RDF data to scale beyond the - limits of the JVM heap. Set to RDB to use the older Jena RDB - store with in-memory caching. -property name: VitroConnection.DataSource.tripleStoreType -example value: SDB - - Specify the maximum number of active connections in the database - connection pool to support the anticipated number of concurrent - page requests. It is not necessary to adjust this value when - using the RDB configuration. -property name: VitroConnection.DataSource.pool.maxActive -example value: 40 - - Specify the maximum number of database connections that will be - allowed to remain idle in the connection pool. Default is - 25% of the maximum number of active connections. -property name: VitroConnection.DataSource.pool.maxIdle -example value: 10 - - Change the dbtype setting to use a database other than MySQL. - Otherwise, leave this value unchanged. - Possible values are DB2, derby, HSQLDB, H2, MySQL, Oracle, - PostgreSQL, and SQLServer. - Refer to http://openjena.org/wiki/SDB/Databases_Supported - for additional information. -property name: VitroConnection.DataSource.dbtype -example value: MySQL - - Specify a driver class name to use a database other than MySQL. - Otherwise, leave this value unchanged. - This JAR file for this driver must be added to the the - webapp/lib directory within the vitro.core.dir specified above. -property name: VitroConnection.DataSource.driver -example value: com.mysql.jdbc.Driver - - Change the validation query used to test database connections - only if necessary to use a database other than MySQL. - Otherwise, leave this value unchanged. -property name: VitroConnection.DataSource.validationQuery -example value: SELECT 1 - - Specify the name of your first admin user for the VIVO application. - This user will have an initial temporary password of 'defaultAdmin'. - You will be prompted to create a new password on first login. -property name: initialAdminUser -example value: defaultAdmin - - The name of a property that can be used to associate an Individual - with a user account. When a user logs in with a name that matches - the value of this property, the user will be authorized to edit - that Individual. -property name: selfEditing.idMatchingProperty -example value: http://vivo.mydomain.edu/ns#networkId - -NOTE: If you want to use an external authentication system like Shibboleth or -CUWebAuth, you will need to set two additional properties in this file. See -the section below entitled "Using an External Authentication System with VIVO". - - Temporal Graph Visualization is used to compare different - organizations/people within an organization on different parameters - like number of publications, grants. This parameter will be used - as a default in case a URI is not provided. It will be also used - whenever this visualization is to be rendered for top level organization. - In absence of this parameter a SPARQL query will be fired which will - attempt to provide a top level organization.The name of a property - that can be used to associate an Individual with a user account. - When a user logs in with a name that matches the value of this property, - the user will be authorized to edit that Individual. -property name: visualization.topLevelOrg -example value: http://vivo-trunk.indiana.edu/individual/topLevelOrgURI - -NOTE: If you want to use an external authentication system like Shibboleth or -CUWebAuth, you will need to set two additional properties in this file. See -the section below entitled "Using an External Authentication System with VIVO". - -------------------------------------------------------------------------------- - -V. Compile and deploy - -At the command line, from the top level of the unpacked distribution directory, -type: - -ant all - -to build VIVO and deploy to Tomcat's webapps directory. - -------------------------------------------------------------------------------- - -VI. Set Tomcat JVM parameters and security limits - -Currently, VIVO copies the contents of your RDF database into memory in order -to serve Web requests quickly (the in-memory copy and the underlying database - are kept in synch as edits are performed). - -VIVO will require more memory than that allocated to Tomcat by default. With -most installations of Tomcat, the setenv.sh or setenv.bat file in Tomcat's bin -directory is a convenient place to set the memory parameters. - -For example: - -export CATALINA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=64m" - -This sets Tomcat to allocate an initial heap of 1024 megabytes, a maximum heap -of 1024 megabytes, and a PermGen space of 64 megs. 1024 megabytes is a minimum -practical heap size for production installations storing data for large academic -institutions, and additional heap space is preferable. For testing with small -sets of data, 256m to 512m should be sufficient. - -If an OutOfMemoryError is encountered during VIVO execution, it can be remedied -by increasing the heap parameters and restarting Tomcat. - -Security limits: VIVO is a multithreaded web application that may require more threads than are -permitted under your Linux installation's default configuration. Ensure that -your installation can support the required number of threads by making the -following edits to /etc/security/limits.conf: - - apache hard nproc 400 - tomcat6 hard nproc 1500 - -------------------------------------------------------------------------------- - -VII. Start Tomcat - -Most Tomcat installations can be started by running startup.sh or startup.bat -in Tomcat's bin directory. Point your browser to http://localhost:8080/vivo/ -to test the application. - -If Tomcat does not start up, or the VIVO application is not visible, check the -catalina.out file in Tomcat's logs directory. - -------------------------------------------------------------------------------- - -VIII. Log in and add RDF data - -If the startup was successful, you will see a welcome message informing you -that you have successfully installed VIVO. Click the "Log in" link near the -upper right corner. Log in with the initialAdminUser username you set up in -Step IV. The initial password for initialAdminUser is defaultAdmin. On first -login, you will be prompted to select a new password and verify it a second -time. - -After verifying your new password, you will be presented with a menu of -editing options. Here you can create OWL classes, object properties, data -properties, and configure the display of data. Currently, any classes you wish -to make visible on your website must be part of a class group, and there a -number of visibility and display options available for each ontology entity. - -VIVO comes with a core VIVO ontology, but you may also upload other ontologies -from an RDF file. Under the "Advanced Data Tools" click "Add/Remove RDF Data." -Note that Vitro currently works best with OWL-DL ontologies and has only limited -support for pure RDF data. You can enter a URL pointing to the RDF data you -wish to load or upload a file on your local machine. Ensure that the "add RDF" -radio button is selected. You will also likely want to check "create -classgroups automatically." Clicking the "Index" tab in the navigation bar at -the top left of the page will show a simple index of the knowledge base. -See more documentation for configuring VIVO, ingesting data, and manually -adding data at http://vivoweb.org/support. - -------------------------------------------------------------------------------- - -IX. Set the Contact Email Address (if using "Contact Us" form) - -If you have configured your application to use the "Contact Us" feature in Step -IV (Vitro.smtpHost), you will also need to add an email address to the VIVO -application. This is the email that the contact form submits to. It can be a -list server or an individual's email address. - -Log in as a system administrator. Navigate to the "Site Admin" table of contents -(link in the right side of the header). Go to "Site Information" (under "Site -Configuration"). In the "Site Information Editing Form," enter a functional -email address in the field "Contact Email Address." and submit the change. - -If you set the Vitro.smtpHost in Step IV and do NOT provide an email address -in this step, your users will receive a java error in the interface. - -------------------------------------------------------------------------------- - -X. Set up Apache Tomcat Connector - -It is recommended that a Tomcat Connector such as mod_jk be used to ensure that -the site address does not include the port number (e.g. 8080) and an additional -reference to the Tomcat context name (e.g. /vivo). - -For example - http://example.com instead of http://example.com:8080/vivo - -Using the mod_jk connector allows for communication between Tomcat and the -primary web server. The "Quick Start HowTo" on the Apache site -http://tomcat.apache.org/connectors-doc/generic_howto/quick.html describes -the minimum server configurations for several popular web servers. - -After setting up the mod_jk connector above, you will need to modify the Tomcat's -server.xml ([tomcat root]/conf/) to respond to requests from Apache via the connector. - -Look for the directive and add the following properties: - - connectionTimeout="20000" maxThreads="320" keepAliveTimeout="20000" - -Note: the value for maxThreads (320) is equal to the value for MaxClients in the -httpd.conf file. - -Locate the directive and update as follows: - - - example.com - - - - - -------------------------------------------------------------------------------- - -XI. Configure Pellet Reasoner - -VIVO uses the Pellet engine to perform reasoning, which runs in the -background at startup and also when the knowledge base is edited. VIVO -continues serving pages while the reasoner continues working; when the -reasoner finishes, the new inferences appear. Inferred statements are cached -in a database graph so that they are available immediately when VIVO is restarted. - -By default, Pellet is fed only an incomplete view of your ontology and only -certain inferences are materialized. These include rdf:type, -rdfs:subClassOf,owl:equivalentClass, and owl:disjointWith. This mode is -typically suitable for ontologies with a lot of instance data. If you would -like to keep the default mode, skip to the next step. - -To enable "complete" OWL inference (materialize all significant entailed -statements), open "vitro-core/webapp/config/web.xml" and search for -PelletReasonerSetup. - -Then change the name of the listener class to PelletReasonerSetupComplete. -Because "complete" reasoning can be very resource intensive, there is also an -option to materialize nearly all inferences except owl:sameAs and -owl:differentFrom. - -This is enabled by specifying PelletReasonerSetupPseudocomplete. For ontologies -with large numbers of individuals, this mode can offer enormous performance -improvements over the "complete" mode. - -Finally, a class called PelletReasonerSetupPseudocompleteIgnoreDataproperties -is provided to improve performance on ontologies with large literals where data -property entailments are not needed. - -------------------------------------------------------------------------------- - -XII. Using an External Authentication System with VIVO - -VIVO can be configured to work with an external authentication system like -Shibboleth or CUWebAuth. - -VIVO must be accessible only through an Apache HTTP server. The Apache server -will be configured to invoke the external authentication system. When the user -completes the authentication, the Apache server will pass a network ID to VIVO, -to identify the user. - -If VIVO has an account for that user, the user will be logged in with the -privileges of that account. In the absence of an account, VIVO will try to find -a page associated with the user. If such a page is found, the user can log in -to edit his own profile information. - ----- Configuring the Apache server: - -Your institution will provide you with instructions for setting up the external -authentication system. The Apache server must be configured to secure a page in -VIVO. When a user reaches this secured page, the Apache server will invoke the -external authentication system. - -For VIVO, this secured page is named: - /loginExternalAuthReturn -When your instructions call for the location of the secured page, this is the -value you should use. - ----- Configuring VIVO: - -To enable external authentication, VIVO requires three values in the -deploy.properties file. - -* The name of the HTTP header that will hold the external user’s network ID - - When a user completes the authentication process, the Apache server will - put the user’s network ID into one of the headers of the HTTP request. - The instructions from your institution should tell you which header is - used for this purpose. - - You need to tell VIVO the name of that HTTP header. Insert a line like - this in the deploy.properties file: - externalAuth.netIdHeaderName = [the header name] - For example: - externalAuth.netIdHeaderName = remote_userID - -* The text for the Login button - - To start the authentication process, the user will click on a button in - the VIVO login form. You need to tell VIVO what text should appear in that - button. - - Put a line like this in the deploy.properties file: - externalAuth.buttonText = [the text for your login button] - For example: - externalAuth.buttonText = Log in using BearCat Shibboleth - - The VIVO login form will display a button labelled “Log in using BearCat - Shibboleth”. - -* Associating a User with a profile page - - If VIVO has an account for the user, the user will be given the privileges - assigned to that account. - - In addition, VIVO will try to associate the user with a profile page, so - the user may edit his own profile data. VIVO will search the data model - for a person with a property that matches the User’s network ID. - - You need to tell VIVO what property should be used for matching. Insert - a line like this in the deploy.properties file: - selfEditing.idMatchingProperty = [the URI of the property] - For example: - selfEditing.idMatchingProperty = http://vivo.mydomain.edu/ns#networkId - -------------------------------------------------------------------------------- - -XIII. Was the installation successful? - -If you have completed the previous steps, you have good indications that the -installation was successful. - -* Step VII showed that Tomcat recognized the webapp, and that the webapp was - able to present the initial page. -* Step VIII verified that you can log in to the administrator account. - -Here is a simple test to see whether the ontology files were loaded: -* Click on the "Index" link on the upper left, below the logo. You should see - a "locations" section, with links for "Country" and "Geographic Location." - The index is built in a background thread, so on your first login, you may - see an empty index instead. Refresh the page periodically to see whether - the index will be populated. This may take some time: with VIVO installed - on a modest laptop computer, loading the ontology files and building the - index took more than 5 minutes from the time that Tomcat was started. -* Click on the "Country" link. You should see an alphabetical list of the - countries of the world. - -Here is a test to see whether your system is configured to serve linked data: -* Point your browser to the home page of your website, and click the "Log in" link - near the upper right corner. Log in with the initialAdminUser username you - set up in Step IV. If this is your first time logging in, you will be - prompted to change the password. -* After you have successfully logged in, click "site admin" in the upper right - corner. In the drop down under "Data Input" select "Faculty Member(core)" - and click the "Add individual of this class" button. -* Enter the name "test individual" under the field "Individual Name," scroll to - the bottom, and click "Create New Record." You will be taken to the "Individual - Control Panel." Make note of the value of the field "URI" it will be used in - the next step. -* Open a new web browser or browser tab to the page http://marbles.sourceforge.net/. - In the pink box on that page enter the URI of the individual you created in the - previous step and click "open." -* In the resulting page search for the URI of the "test individual." You should - find it towards the bottom of the page next to a red dot followed by "redirect - (303)." This indicates that you are successfully serving linked RDF data. - If the URI of the "test individual" is followed by "failed (400)" you are not - successfully serving linked data. - -Finally, test the search index. -* The search box is on the right side, directly opposite the "Index" link. - Type the word "Australia" into the box, and click on the "Search" - button.You should see a page of results, with links to countries that - border Australia, individuals that include Australia, and to - Australia itself. From 72a5e9414ead78fdcb4b04905bf2a7b909dc8c87 Mon Sep 17 00:00:00 2001 From: cdtank Date: Fri, 14 Jan 2011 22:34:03 +0000 Subject: [PATCH 002/427] 1. Making temporal graph vis template for grants to be similar to the publications version. --- ...ityComparisonGrantsStandaloneActivator.ftl | 94 +++++++------------ .../entityComparisonStandaloneActivator.ftl | 3 +- 2 files changed, 36 insertions(+), 61 deletions(-) diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl index 8f233de3..e997ace9 100644 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl @@ -16,67 +16,42 @@ <#assign temporalGraphSmallIcon = '${urls.images}/visualization/temporal_vis_small_icon.jpg'> - <#assign TemporalGraphDownloadFile = '${urls.base}${dataVisualizationURLRoot}?vis=entity_grant_count&uri=${organizationURI}&labelField=label'> - <#-- Javascript files --> -<#assign flot = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js'> <#assign excanvas = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.js'> - +<#assign flot = 'js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js'> +<#assign fliptext = 'js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js'> +<#assign jqueryNotify = 'js/jquery_plugins/jquery.notify.min.js'> +<#assign jqueryUI = 'js/jquery-ui/js/jquery-ui-1.8.4.custom.min.js'> +<#assign datatable = 'js/jquery_plugins/jquery.dataTables.min.js'> +<#assign entityComparisonUtils = 'js/visualization/entitycomparison/util.js'> +<#assign entityComparisonConstants = 'js/visualization/entitycomparison/constants.js'> - -<#assign fliptext = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js'> - -<#assign jqueryNotify = '${urls.base}/js/jquery_plugins/jquery.notify.min.js'> -<#assign jqueryUI = '${urls.base}/js/jquery-ui/js/jquery-ui-1.8.4.custom.min.js'> - -<#assign datatable = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/datatable/jquery.dataTables.js'> -<#assign autoellipsis = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/jquery.AutoEllipsis.js'> - -<#assign entityComparisonUtils = '${urls.base}/js/visualization/entitycomparison/util.js'> -<#assign entityComparisonConstants = '${urls.base}/js/visualization/entitycomparison/constants.js'> - - - - - - - - - - - - - - - - +${scripts.add(flot)} +${scripts.add(fliptext)} +${scripts.add(jqueryUI)} +${scripts.add(datatable)} +${scripts.add(entityComparisonUtils)} +${scripts.add(entityComparisonConstants)} +${scripts.add(jqueryNotify)} <#-- CSS files --> - -<#assign demoTable = "${urls.base}/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css" /> - -<#assign jqueryUIStyle = "${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.4.custom.css" /> -<#assign jqueryNotifyStyle = "${urls.base}/css/jquery_plugins/ui.notify.css" /> - -<#assign entityComparisonStyle = "${urls.base}/css/visualization/entitycomparison/layout.css" /> +<#assign demoTable = "js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css" /> +<#assign jqueryUIStyle = "js/jquery-ui/css/smoothness/jquery-ui-1.8.4.custom.css" /> +<#assign jqueryNotifyStyle = "css/jquery_plugins/ui.notify.css" /> +<#assign entityComparisonStyle = "css/visualization/entitycomparison/layout.css" /> <#assign entityComparisonStyleIEHack = "${urls.base}/css/visualization/entitycomparison/layout-ie.css" /> +<#assign vizStyle = "css/visualization/visualization.css" /> -<#assign vizStyle = "${urls.base}/css/visualization/visualization.css" /> - - - - - - - - +${stylesheets.add(jqueryUIStyle)} +${stylesheets.add(demoTable)} +${stylesheets.add(entityComparisonStyle)} +${stylesheets.add(vizStyle)} +${stylesheets.add(jqueryNotifyStyle)} @@ -90,14 +65,14 @@ var subOrganizationVivoProfileURL = "${subOrganizationVivoProfileURL}"; var subOrganizationTemporalGraphURL = "${subOrganizationTemporalGraphURL}"; var subOrganizationTemporalGraphPubURL = "${subOrganizationTemporalGraphPubURL}"; +var jsonString = '${jsonContent}'; +var organizationLabel = '${organizationLabel}'; + - From 4930226b6f9515f4b8a97830555341cbbf11e1b2 Mon Sep 17 00:00:00 2001 From: mb863 Date: Tue, 18 Jan 2011 15:39:10 +0000 Subject: [PATCH 044/427] NIHVIVO-641: Fixed space issues in browse alpha navigation --- themes/wilma/css/wilma.css | 1 + 1 file changed, 1 insertion(+) diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index c8d92b16..5dffb711 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -1032,6 +1032,7 @@ ul#alpha-browse-childClass a.selected { color: #2ea0cf; background: url(../images/arrowSmall.gif) -3px 7px no-repeat; margin-right: 3px; + margin-left: 5px; } ul#alpha-browse-childClass .count-classes { font-size: .75em; From 633dc3774e2104de7e2d59a789fccb934a5a6ed5 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Tue, 18 Jan 2011 16:44:18 +0000 Subject: [PATCH 045/427] Holly has started a new CheckVisualizations test suite. It needs a lot more work. --- .../CheckVisualizations/AddCoAuthors.html | 224 ++++ .../AddCoInvestigators.html | 224 ++++ .../suites/CheckVisualizations/AddGrants.html | 994 ++++++++++++++++++ .../CheckVisualizations/AddPublications.html | 994 ++++++++++++++++++ .../CheckVisualizations/AddTestFaculty.html | 274 +++++ .../CheckVisualizations/AddTestLibrarian.html | 269 +++++ .../CheckVisualizations/DeleteIndexStuff.html | 509 +++++++++ .../CheckVisualizations/DeleteTestCos.html | 439 ++++++++ .../DeleteTestFaculty.html | 439 ++++++++ .../DeleteTestLibrarian.html | 239 +++++ .../CheckVisualizations/SetDefaultTheme.html | 139 +++ .../suites/CheckVisualizations/Suite.html | 24 + 12 files changed, 4768 insertions(+) create mode 100644 utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html create mode 100644 utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html create mode 100644 utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html create mode 100644 utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html create mode 100644 utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html create mode 100644 utilities/acceptance-tests/suites/CheckVisualizations/AddTestLibrarian.html create mode 100644 utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html create mode 100644 utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html create mode 100644 utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html create mode 100644 utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestLibrarian.html create mode 100644 utilities/acceptance-tests/suites/CheckVisualizations/SetDefaultTheme.html create mode 100644 utilities/acceptance-tests/suites/CheckVisualizations/Suite.html diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html new file mode 100644 index 00000000..b589f51e --- /dev/null +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html @@ -0,0 +1,224 @@ + + + + + + +CreateTestLibrarian + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CreateTestLibrarian
commentAdd test Librarian named Lily Librarian
deleteAllVisibleCookies
open/vivo/
assertTitleVIVO
commentMust be logged off to start
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust login as the site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO
clickAndWaitlink=Site Admin
assertTitleVIVO Site Administration
verifyTextPresentData Input
selectVClassURIlabel=Librarian (core)
clickAndWait//input[@value='Add individual of this class']
assertTitleEdit
commentAdd Lily Librarian
typefirstNameLily
typelastNameLibrarian
clickAndWaitsubmit
commentEdit Lily Librarian to add title
assertTitleLibrarian, Lily
clickAndWaitlink=edit this individual
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
typeMonikerSelectAltAssociate Librarian
clickAndWaitprimaryAction
assertTitleIndividual Control Panel
commentVerify that account was created
verifyTextPresentLibrarian, Lily
verifyTextPresentAssociate Librarian
commentLogout
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html new file mode 100644 index 00000000..b589f51e --- /dev/null +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html @@ -0,0 +1,224 @@ + + + + + + +CreateTestLibrarian + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CreateTestLibrarian
commentAdd test Librarian named Lily Librarian
deleteAllVisibleCookies
open/vivo/
assertTitleVIVO
commentMust be logged off to start
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust login as the site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO
clickAndWaitlink=Site Admin
assertTitleVIVO Site Administration
verifyTextPresentData Input
selectVClassURIlabel=Librarian (core)
clickAndWait//input[@value='Add individual of this class']
assertTitleEdit
commentAdd Lily Librarian
typefirstNameLily
typelastNameLibrarian
clickAndWaitsubmit
commentEdit Lily Librarian to add title
assertTitleLibrarian, Lily
clickAndWaitlink=edit this individual
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
typeMonikerSelectAltAssociate Librarian
clickAndWaitprimaryAction
assertTitleIndividual Control Panel
commentVerify that account was created
verifyTextPresentLibrarian, Lily
verifyTextPresentAssociate Librarian
commentLogout
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html new file mode 100644 index 00000000..c3fba1d7 --- /dev/null +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html @@ -0,0 +1,994 @@ + + + + + + +AddBook + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AddBook
deleteAllVisibleCookies
setTimeout100000
commentAdd Book
open/vivo/
assertTitleVIVO
commentMust not be logged in already
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust login as site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO
commentNavigate to Frank Furter
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Furter, Frank
assertTitleFurter, Frank
commentAdd a book
clickAndWait//div[@id='wrapper-content']/section[4]/article[1]/h3/a/img
assertTitleEdit
verifyTextPresentCreate publication entry for Furter, Frank
verifyTextPresentPublication Type
selecttypeSelectorlabel=Book
verifyTextPresentTitle
typerelatedIndLabelNintendo: Good or Bad for Kids?
clickAndWaitsubmit
assertTitleFurter, Frank
verifyTextPresentbook
verifyElementPresentlink=Nintendo: Good or Bad for Kids?
verifyTextPresentNintendo: Good or Bad for Kids?
clickAndWaitlink=Nintendo: Good or Bad for Kids?
assertTitleNintendo: Good or Bad for Kids?
clickAndWait//div[@id='wrapper-content']/section[6]/article[7]/h3/a/img
assertTitleEdit
selecttypeOfNewlabel=Publisher (core)
clickAndWaitsubmit
assertTitleEdit
typenamePutnam
clickAndWaitsubmit
assertTitleexact:Nintendo: Good or Bad for Kids?
clickAndWait//div[@id='wrapper-content']/section[6]/article[8]/h3/a/img
assertTitleEdit
typetinymceNew York
clickAndWaitsubmit
assertTitleexact:Nintendo: Good or Bad for Kids?
clickAndWait//div[@id='wrapper-content']/section[4]/article/h3/a/img
assertTitleEdit
clickAndWait//input[@id='submit' and @value='add a new item to this list']
assertTitleEdit
typename2009
clickAndWaitsubmit
assertTitleexact:Nintendo: Good or Bad for Kids?
commentNavigate to Frank Furter
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Furter, Frank
assertTitleFurter, Frank
commentAdd an Article
clickAndWait//h3[@id='selectedPublications']/a/img
assertTitleEdit
selecttypeSelectorlabel=Academic Article
click//form[@id='addPublicationForm']/div/p/label
typerelatedIndLabelWhy Games Are Important to Child Growth
clickAndWaitsubmit
assertTitleFurter, Frank
clickAndWaitlink=Why Games Are Important to Child Growth
assertTitleWhy Games Are Important to Child Growth
clickAndWait//h3[@id='issue']/a/img
assertTitleEdit
assertTitleWhy Games Are Important to Child Growth
clickAndWait//h3[@id='startPage']/a/img
assertTitleEdit
typetinymce111
clickAndWaitsubmit
assertTitleWhy Games Are Important to Child Growth
clickAndWait//h3[@id='endPage']/a/img
assertTitleEdit
typetinymce222
clickAndWaitsubmit
assertTitleWhy Games Are Important to Child Growth
clickAndWait//h3[@id='publishedIn']/a/img
assertTitleEdit
clickAndWaitsubmit
assertTitleEdit
typenameChildhood Today
clickAndWaitsubmit
assertTitleWhy Games Are Important to Child Growth
clickAndWait//h3[@id='date/timeValue']/a/img
assertTitleEdit
clickAndWait//input[@id='submit' and @value='add a new item to this list']
assertTitleEdit
typename2001
clickAndWaitsubmit
assertTitleWhy Games Are Important to Child Growth
commentNavigate to Frank Furter
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Furter, Frank
assertTitleFurter, Frank
commentAdd a Chapter
clickAndWait//h3[@id='selectedPublications']/a/img
assertTitleEdit
selecttypeSelectorlabel=Chapter
typerelatedIndLabelGame Wars
clickAndWaitsubmit
assertTitleFurter, Frank
clickAndWaitlink=Game Wars
assertTitleGame Wars
clickAndWait//h3[@id='startPage']/a/img
assertTitleEdit
typetinymce333
clickAndWaitsubmit
assertTitleGame Wars
clickAndWait//h3[@id='endPage']/a/img
assertTitleEdit
typetinymce444
clickAndWaitsubmit
assertTitleGame Wars
clickAndWait//h3[@id='publishedIn']/a/img
assertTitleEdit
assertTitleGame Wars
clickAndWait//h3[@id='date/timeValue']/a/img
assertTitleEdit
clickAndWait//input[@id='submit' and @value='add a new item to this list']
assertTitleEdit
typename2003
clickAndWaitsubmit
assertTitleGame Wars
commentNavigate to Frank Furter
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Furter, Frank
assertTitleFurter, Frank
commentAdd a Conference
clickAndWait//h3[@id='selectedPublications']/a/img
assertTitleEdit
selecttypeSelectorlabel=Conference Paper
typerelatedIndLabelGames to Promote Growth
clickAndWaitsubmit
assertTitleFurter, Frank
clickAndWaitlink=Games to Promote Growth
assertTitleGames to Promote Growth
clickAndWait//h3[@id='presentedAt']/a/img
assertTitleEdit
clickAndWaitsubmit
assertTitleEdit
typenameGame World 2005
clickAndWaitsubmit
assertTitleGames to Promote Growth
clickAndWait//h3[@id='date/timeValue']/a/img
assertTitleEdit
clickAndWait//input[@id='submit' and @value='add a new item to this list']
assertTitleEdit
typename2005
clickAndWaitsubmit
assertTitleGames to Promote Growth
commentNavigate to Frank Furter
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Furter, Frank
assertTitleFurter, Frank
commentVerify Publication and Network Display
verifyTextPresent4 publications
within the last 10 years
verifyTextPresent
Co-Author Network
verifyTextPresentCo-Investigator Network
verifyElementPresentlink=Co-Author Network
verifyElementPresentlink=Co-Investigator Network
clickAndWaitlink=Co-Author Network
assertTitleFurter, Frank - Person Level Visualization
verifyTextPresent0   Joint Publication(s)
verifyTextPresent0   Joint Co-author(s)
verifyTextPresent4 publications
from 2002 to 2011
verifyTextPresentPublications per year
verifyTextPresent2001 1
verifyTextPresent2003 1
verifyTextPresent2005 1
verifyTextPresent2009 1
commentLog out
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html new file mode 100644 index 00000000..c3fba1d7 --- /dev/null +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html @@ -0,0 +1,994 @@ + + + + + + +AddBook + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AddBook
deleteAllVisibleCookies
setTimeout100000
commentAdd Book
open/vivo/
assertTitleVIVO
commentMust not be logged in already
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust login as site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO
commentNavigate to Frank Furter
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Furter, Frank
assertTitleFurter, Frank
commentAdd a book
clickAndWait//div[@id='wrapper-content']/section[4]/article[1]/h3/a/img
assertTitleEdit
verifyTextPresentCreate publication entry for Furter, Frank
verifyTextPresentPublication Type
selecttypeSelectorlabel=Book
verifyTextPresentTitle
typerelatedIndLabelNintendo: Good or Bad for Kids?
clickAndWaitsubmit
assertTitleFurter, Frank
verifyTextPresentbook
verifyElementPresentlink=Nintendo: Good or Bad for Kids?
verifyTextPresentNintendo: Good or Bad for Kids?
clickAndWaitlink=Nintendo: Good or Bad for Kids?
assertTitleNintendo: Good or Bad for Kids?
clickAndWait//div[@id='wrapper-content']/section[6]/article[7]/h3/a/img
assertTitleEdit
selecttypeOfNewlabel=Publisher (core)
clickAndWaitsubmit
assertTitleEdit
typenamePutnam
clickAndWaitsubmit
assertTitleexact:Nintendo: Good or Bad for Kids?
clickAndWait//div[@id='wrapper-content']/section[6]/article[8]/h3/a/img
assertTitleEdit
typetinymceNew York
clickAndWaitsubmit
assertTitleexact:Nintendo: Good or Bad for Kids?
clickAndWait//div[@id='wrapper-content']/section[4]/article/h3/a/img
assertTitleEdit
clickAndWait//input[@id='submit' and @value='add a new item to this list']
assertTitleEdit
typename2009
clickAndWaitsubmit
assertTitleexact:Nintendo: Good or Bad for Kids?
commentNavigate to Frank Furter
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Furter, Frank
assertTitleFurter, Frank
commentAdd an Article
clickAndWait//h3[@id='selectedPublications']/a/img
assertTitleEdit
selecttypeSelectorlabel=Academic Article
click//form[@id='addPublicationForm']/div/p/label
typerelatedIndLabelWhy Games Are Important to Child Growth
clickAndWaitsubmit
assertTitleFurter, Frank
clickAndWaitlink=Why Games Are Important to Child Growth
assertTitleWhy Games Are Important to Child Growth
clickAndWait//h3[@id='issue']/a/img
assertTitleEdit
assertTitleWhy Games Are Important to Child Growth
clickAndWait//h3[@id='startPage']/a/img
assertTitleEdit
typetinymce111
clickAndWaitsubmit
assertTitleWhy Games Are Important to Child Growth
clickAndWait//h3[@id='endPage']/a/img
assertTitleEdit
typetinymce222
clickAndWaitsubmit
assertTitleWhy Games Are Important to Child Growth
clickAndWait//h3[@id='publishedIn']/a/img
assertTitleEdit
clickAndWaitsubmit
assertTitleEdit
typenameChildhood Today
clickAndWaitsubmit
assertTitleWhy Games Are Important to Child Growth
clickAndWait//h3[@id='date/timeValue']/a/img
assertTitleEdit
clickAndWait//input[@id='submit' and @value='add a new item to this list']
assertTitleEdit
typename2001
clickAndWaitsubmit
assertTitleWhy Games Are Important to Child Growth
commentNavigate to Frank Furter
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Furter, Frank
assertTitleFurter, Frank
commentAdd a Chapter
clickAndWait//h3[@id='selectedPublications']/a/img
assertTitleEdit
selecttypeSelectorlabel=Chapter
typerelatedIndLabelGame Wars
clickAndWaitsubmit
assertTitleFurter, Frank
clickAndWaitlink=Game Wars
assertTitleGame Wars
clickAndWait//h3[@id='startPage']/a/img
assertTitleEdit
typetinymce333
clickAndWaitsubmit
assertTitleGame Wars
clickAndWait//h3[@id='endPage']/a/img
assertTitleEdit
typetinymce444
clickAndWaitsubmit
assertTitleGame Wars
clickAndWait//h3[@id='publishedIn']/a/img
assertTitleEdit
assertTitleGame Wars
clickAndWait//h3[@id='date/timeValue']/a/img
assertTitleEdit
clickAndWait//input[@id='submit' and @value='add a new item to this list']
assertTitleEdit
typename2003
clickAndWaitsubmit
assertTitleGame Wars
commentNavigate to Frank Furter
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Furter, Frank
assertTitleFurter, Frank
commentAdd a Conference
clickAndWait//h3[@id='selectedPublications']/a/img
assertTitleEdit
selecttypeSelectorlabel=Conference Paper
typerelatedIndLabelGames to Promote Growth
clickAndWaitsubmit
assertTitleFurter, Frank
clickAndWaitlink=Games to Promote Growth
assertTitleGames to Promote Growth
clickAndWait//h3[@id='presentedAt']/a/img
assertTitleEdit
clickAndWaitsubmit
assertTitleEdit
typenameGame World 2005
clickAndWaitsubmit
assertTitleGames to Promote Growth
clickAndWait//h3[@id='date/timeValue']/a/img
assertTitleEdit
clickAndWait//input[@id='submit' and @value='add a new item to this list']
assertTitleEdit
typename2005
clickAndWaitsubmit
assertTitleGames to Promote Growth
commentNavigate to Frank Furter
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Furter, Frank
assertTitleFurter, Frank
commentVerify Publication and Network Display
verifyTextPresent4 publications
within the last 10 years
verifyTextPresent
Co-Author Network
verifyTextPresentCo-Investigator Network
verifyElementPresentlink=Co-Author Network
verifyElementPresentlink=Co-Investigator Network
clickAndWaitlink=Co-Author Network
assertTitleFurter, Frank - Person Level Visualization
verifyTextPresent0   Joint Publication(s)
verifyTextPresent0   Joint Co-author(s)
verifyTextPresent4 publications
from 2002 to 2011
verifyTextPresentPublications per year
verifyTextPresent2001 1
verifyTextPresent2003 1
verifyTextPresent2005 1
verifyTextPresent2009 1
commentLog out
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html new file mode 100644 index 00000000..2ad211a1 --- /dev/null +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html @@ -0,0 +1,274 @@ + + + + + + +AddTestFaculty + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AddTestFaculty
deleteAllVisibleCookies
setTimeout100000
commentAdd a faculty member for test purposes
open/vivo/
assertTitleVIVO
commentMust not be logged in already
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust login as site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO
clickAndWaitlink=Site Admin
assertTitleVIVO Site Administration
commentSelect to add an Individual of Faculty
selectVClassURIlabel=Faculty Member (core)
clickAndWait//input[@value='Add individual of this class']
assertTitleEdit
commentEnter faculty member name and title
typefirstNameFrank
typelastNameFurter
clickAndWaitsubmit
assertTitleFurter, Frank
commentEdit Frank Furter to make him an Associate Professor
clickAndWaitlink=edit this individual
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
typeMonikerSelectAltAssociate Professor
clickAndWaitprimaryAction
assertTitleIndividual Control Panel
commentVerify new faculty member added
verifyTextPresentFurter, Frank
verifyTextPresentAssociate Professor
commentVerify Co Networks not showing
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Furter, Frank
assertTitleFurter, Frank
verifyTextNotPresentCo-Investigator Network
verifyTextNotPresentCo-Author Network
commentLogout
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddTestLibrarian.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddTestLibrarian.html new file mode 100644 index 00000000..79b98527 --- /dev/null +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddTestLibrarian.html @@ -0,0 +1,269 @@ + + + + + + +CreateTestLibrarian + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CreateTestLibrarian
commentAdd test Librarian named Lily Librarian
deleteAllVisibleCookies
open/vivo/
assertTitleVIVO
commentMust be logged off to start
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust login as the site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO
clickAndWaitlink=Site Admin
assertTitleVIVO Site Administration
verifyTextPresentData Input
selectVClassURIlabel=Librarian (core)
clickAndWait//input[@value='Add individual of this class']
assertTitleEdit
commentAdd Lily Librarian
typefirstNameLily
typelastNameLibrarian
clickAndWaitsubmit
commentEdit Lily Librarian to add title
assertTitleLibrarian, Lily
clickAndWaitlink=edit this individual
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
typeMonikerSelectAltAssociate Librarian
clickAndWaitprimaryAction
assertTitleIndividual Control Panel
commentVerify that account was created
verifyTextPresentLibrarian, Lily
verifyTextPresentAssociate Librarian
commentVerify Co Networks not showing
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Librarian
assertTitleLibrarian
clickAndWaitlink=Librarian, Lily
assertTitleLibrarian, Lily
verifyTextNotPresentCo-Investigator Network
verifyTextNotPresentCo-Author Network
commentLogout
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html new file mode 100644 index 00000000..498bc322 --- /dev/null +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html @@ -0,0 +1,509 @@ + + + + + + +DeleteIndexStuff + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DeleteIndexStuff
deleteAllVisibleCookies
setTimeout100000
commentDelete everything left in the index
open/vivo/
assertTitleVIVO
commentMust not be logged in already
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust login as site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO
commentNavigate to Index
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
commentVerify that everything else is still there
verifyTextPresentresearch
verifyTextPresentevents
verifyTextPresentorganizations
commentDelete other stuff
clickAndWaitlink=Subject Area
assertTitleSubject Area
clickAndWaitlink=Child Development
assertTitleChild Development
clickAndWaitlink=edit this individual
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
click_delete
assertConfirmationAre you SURE you want to delete this entity? If in doubt, CANCEL.
pause5000
assertTitleVIVO Site Administration
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Organization
assertTitleOrganization
clickAndWaitlink=Putnam
assertTitlePutnam
clickAndWaitlink=edit this individual
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
click_delete
assertConfirmationAre you SURE you want to delete this entity? If in doubt, CANCEL.
pause5000
assertTitleVIVO Site Administration
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Organization
assertTitleOrganization
clickAndWaitlink=Marcel Dekker
assertTitleMarcel Dekker
clickAndWaitlink=edit this individual
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
click_delete
assertConfirmationAre you SURE you want to delete this entity? If in doubt, CANCEL.
pause5000
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Conference
assertTitleConference
clickAndWaitlink=Games and Child Development
assertTitleGames and Child Development
clickAndWaitlink=edit this individual
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
click_delete
assertConfirmationAre you SURE you want to delete this entity? If in doubt, CANCEL.
pause5000
assertTitleVIVO Site Administration
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
commentVerify that everything is gone
pause50000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
verifyTextNotPresenttopics
verifyTextNotPresentevents
verifyTextNotPresentorganizations
commentLog out
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html new file mode 100644 index 00000000..ad206024 --- /dev/null +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html @@ -0,0 +1,439 @@ + + + + + + +DeleteTestFaculty + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DeleteTestFaculty
deleteAllVisibleCookies
setTimeout100000
commentDelete test faculty members
open/vivo/
assertTitleVIVO
commentMust not be logged in already
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust log in as site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO
commentNavigate to index
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
commentVerify both people to be deleted are there
verifyTextPresentpeople
verifyTextPresentFaculty Member
verifyTextPresentPerson
commentNavigate to first faculty member
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Furter, Frank
assertTitleFurter, Frank
clickAndWaitlink=edit this individual
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
commentDelete first faculty member
click_delete
assertConfirmationAre you SURE you want to delete this entity? If in doubt, CANCEL.
waitForPageToLoad5000
assertTitleVIVO Site Administration
commentNavigate to second faculty member
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Sunny Sony
assertTitleSunny Sony
clickAndWaitlink=edit this individual
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
commentDelete second faculty member
click_delete
assertConfirmationAre you SURE you want to delete this entity? If in doubt, CANCEL.
waitForPageToLoad5000
assertTitleVIVO Site Administration
commentVerify both faculty members are gone
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
pause50000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
verifyTextNotPresentpeople
verifyTextNotPresentFaculty Member
verifyTextNotPresentPerson
commentLogout
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html new file mode 100644 index 00000000..ad206024 --- /dev/null +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html @@ -0,0 +1,439 @@ + + + + + + +DeleteTestFaculty + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DeleteTestFaculty
deleteAllVisibleCookies
setTimeout100000
commentDelete test faculty members
open/vivo/
assertTitleVIVO
commentMust not be logged in already
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust log in as site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO
commentNavigate to index
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
commentVerify both people to be deleted are there
verifyTextPresentpeople
verifyTextPresentFaculty Member
verifyTextPresentPerson
commentNavigate to first faculty member
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Furter, Frank
assertTitleFurter, Frank
clickAndWaitlink=edit this individual
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
commentDelete first faculty member
click_delete
assertConfirmationAre you SURE you want to delete this entity? If in doubt, CANCEL.
waitForPageToLoad5000
assertTitleVIVO Site Administration
commentNavigate to second faculty member
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Faculty Member
assertTitleFaculty Member
clickAndWaitlink=Sunny Sony
assertTitleSunny Sony
clickAndWaitlink=edit this individual
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
commentDelete second faculty member
click_delete
assertConfirmationAre you SURE you want to delete this entity? If in doubt, CANCEL.
waitForPageToLoad5000
assertTitleVIVO Site Administration
commentVerify both faculty members are gone
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
pause50000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
refreshAndWait20000
verifyTextNotPresentpeople
verifyTextNotPresentFaculty Member
verifyTextNotPresentPerson
commentLogout
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestLibrarian.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestLibrarian.html new file mode 100644 index 00000000..bac1a876 --- /dev/null +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestLibrarian.html @@ -0,0 +1,239 @@ + + + + + + +DeleteTestLibrarian + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DeleteTestLibrarian
commentDelete test person Lily Librarian
deleteAllVisibleCookies
open/vivo/
assertTitleVIVO
commentMust not be logged in
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust log in as site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO
commentNavigate to Lily Librarian
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Librarian
assertTitleLibrarian
clickAndWaitlink=Librarian, Lily
assertTitleLibrarian, Lily
clickAndWaitlink=edit this individual
commentDelete Lily Librarian
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
click_delete
assertConfirmationAre you SURE you want to delete this entity? If in doubt, CANCEL.
waitForPageToLoad5000
assertTitleVIVO Site Administration
commentVerify that Lily Librarian is indeed gone
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
verifyTextNotPresentLibrarian
commentLogout
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/SetDefaultTheme.html b/utilities/acceptance-tests/suites/CheckVisualizations/SetDefaultTheme.html new file mode 100644 index 00000000..2dbd2d83 --- /dev/null +++ b/utilities/acceptance-tests/suites/CheckVisualizations/SetDefaultTheme.html @@ -0,0 +1,139 @@ + + + + + + +SetDefaultTheme + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SetDefaultTheme
commentSet default theme to WILMA
deleteAllVisibleCookies
open/vivo/
assertTitleVIVO
clickAndWaitlink=Log in
assertTitleLog in to VIVO
typeloginNametestAdmin
typepasswordPassword
clickAndWaitloginForm
assertTitleVIVO
clickAndWaitlink=Site Admin
assertTitleVIVO Site Administration
clickAndWaitlink=Site information
assertTitleSite Information Editing Form
selectThemeDirlabel=wilma
clickAndWaitprimaryAction
assertTitleVIVO Site Administration
clickAndWaitlink=Home
assertTitleVIVO
clickAndWaitlink=Log out
assertTitleVIVO
+ + diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/Suite.html b/utilities/acceptance-tests/suites/CheckVisualizations/Suite.html new file mode 100644 index 00000000..0a30e86e --- /dev/null +++ b/utilities/acceptance-tests/suites/CheckVisualizations/Suite.html @@ -0,0 +1,24 @@ + + + + + + Test Suite + + + + + + + + + + + + + + + +
Test Suite
SetDefaultTheme
AddTestFaculty
AddTestLibrarian
AddPublications
AddCoAuthors
AddGrants
AddCoInvestigators
DeleteTestFaculty
DeleteTestLibrarian
DeleteTestCos
DeleteIndexStuff
+ + From d5d2c30515ff0e93e008403530bed25c449c6286 Mon Sep 17 00:00:00 2001 From: bjl23 Date: Tue, 18 Jan 2011 20:23:08 +0000 Subject: [PATCH 046/427] NIHVIVO-1801 modification to sparql query for DateTimePrecisions --- .../listViewConfig-dateTimeInterval.xml | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/productMods/config/listViewConfig-dateTimeInterval.xml b/productMods/config/listViewConfig-dateTimeInterval.xml index d3f258e8..d2a9ae27 100644 --- a/productMods/config/listViewConfig-dateTimeInterval.xml +++ b/productMods/config/listViewConfig-dateTimeInterval.xml @@ -9,24 +9,36 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> - SELECT DISTINCT ?dateTimeInterval (afn:localname(?dateTimeInterval) AS ?intervalName) - ?valueStart (afn:localname(?valueStart) AS ?valueStartName) + SELECT DISTINCT ?dateTimeInterval ?intervalName + ?valueStart ?valueStartName ?dateTimeStart - (afn:localname(?dateTimePrecisionStart) AS ?precisionStart) - ?valueEnd (afn:localname(?valueEnd) AS ?valueEndName) + ?precisionStart + ?valueEnd ?valueEndName ?dateTimeEnd - (afn:localname(?dateTimePrecisionEnd) AS ?precisionEnd) WHERE { - GRAPH ?g1 { ?subject ?property ?dateTimeInterval } - OPTIONAL { GRAPH ?g2 { ?dateTimeInterval core:start ?valueStart } + ?precisionEnd WHERE { + GRAPH ?g1 { ?subject ?property ?dateTimeInterval + LET(?intervalName := afn:localname(?dateTimeInterval)) + } + OPTIONAL { GRAPH ?g2 { ?dateTimeInterval core:start ?valueStart + LET(?valueStartName := afn:localname(?valueStart)) + } OPTIONAL { GRAPH ?g3 { ?valueStart core:dateTime ?dateTimeStart } } - OPTIONAL { GRAPH ?g4 { ?valueStart core:dateTimePrecision ?dateTimePrecisionStart } } + OPTIONAL { GRAPH ?g4 { ?valueStart core:dateTimePrecision ?dateTimePrecisionStart + LET(?precisionStart := afn:localname(?dateTimePrecisionStart)) + } + } } - OPTIONAL { GRAPH ?g5 { ?dateTimeInterval core:end ?valueEnd } + OPTIONAL { GRAPH ?g5 { ?dateTimeInterval core:end ?valueEnd + LET(?valueEndName := afn:localname(?valueEnd)) + } OPTIONAL { GRAPH ?g6 { ?valueEnd core:dateTime ?dateTimeEnd } } - OPTIONAL { GRAPH ?g7 { ?valueEnd core:dateTimePrecision ?dateTimePrecisionEnd } } + OPTIONAL { GRAPH ?g7 { ?valueEnd core:dateTimePrecision ?dateTimePrecisionEnd + LET(?precisionEnd := afn:localname(?dateTimePrecisionEnd)) + } + } } } - \ No newline at end of file + From e348c1588f828ec768f6fdd425125a63be8e4b1f Mon Sep 17 00:00:00 2001 From: hlm7 Date: Tue, 18 Jan 2011 20:29:03 +0000 Subject: [PATCH 047/427] Holly finished up the first draft of the CheckVisualizations test suite. --- .../CheckVisualizations/AddCoAuthors.html | 337 ++++++-- .../AddCoInvestigators.html | 372 ++++++++- .../suites/CheckVisualizations/AddGrants.html | 757 ++---------------- .../CheckVisualizations/AddPublications.html | 67 +- .../CheckVisualizations/DeleteIndexStuff.html | 545 ++++++++++++- .../CheckVisualizations/DeleteTestCos.html | 256 +++--- .../DeleteTestFaculty.html | 90 +-- .../suites/CheckVisualizations/Suite.html | 4 +- 8 files changed, 1378 insertions(+), 1050 deletions(-) diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html index b589f51e..91f986a9 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html @@ -100,18 +100,68 @@ - verifyTextPresent - Data Input + comment + Add 1 co-author for book - select - VClassURI - label=Librarian (core) + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + clickAndWait - //input[@value='Add individual of this class'] + link=Book + + + + assertTitle + Book + + + + clickAndWait + link=exact:Nintendo: Good or Bad for Kids? + + + + assertTitle + exact:Nintendo: Good or Bad for Kids? + + + + clickAndWait + //h3[@id='authors']/a/img + + + + assertTitle + Edit + + + + click + showAddFormButton + + + + type + lastName + Smith + + + type + firstName + Sally + + + clickAndWait + submit @@ -121,82 +171,277 @@ comment - Add Lily Librarian + Add 2 co-authors for article + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Academic Article + + + + assertTitle + Academic Article + + + + clickAndWait + link=Why Games Are Important to Child Growth + + + + assertTitle + Why Games Are Important to Child Growth + + + + clickAndWait + //h3[@id='authors']/a/img + + + + assertTitle + Edit + + + + click + showAddFormButton - - type - firstName - Lily - type lastName - Librarian + Johnson clickAndWait submit - - comment - Edit Lily Librarian to add title - - assertTitle - Librarian, Lily - - - - clickAndWait - link=edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form + Edit type - MonikerSelectAlt - Associate Librarian + firstName + Jane clickAndWait - primaryAction + submit assertTitle - Individual Control Panel + Edit + + + + click + showAddFormButton + + + + type + lastName + Zink + + + type + firstName + Zoe + + + clickAndWait + submit + + + + assertTitle + Edit comment - Verify that account was created + Add no co-author(s) for chapter + + + + comment + Add no co-author(s) for conference + + + + comment + Verify co-authors reflected properly + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Faculty Member + + + + assertTitle + Faculty Member + + + + clickAndWait + link=Furter, Frank + + + + assertTitle + Furter, Frank + + + + verifyElementPresent + link=Co-Author Network + + + + verifyElementPresent + link=Co-Investigator Network + + + + clickAndWait + link=Co-Author Network + + + + assertTitle + Furter, Frank - Person Level Visualization verifyTextPresent - Librarian, Lily + Furter, Frank verifyTextPresent - Associate Librarian + Associate Professor + + + + verifyTextPresent + VIVO profile | Co-author network + + + + verifyTextPresent + 4   Joint Publication(s) + + + + verifyTextPresent + 3   Joint Co-author(s) + + + + verifyTextPresent + Publications per year + + + + verifyTextPresent + 2001 1 + + + + verifyTextPresent + 2003 1 + + + + verifyTextPresent + 2005 1 + + + + verifyTextPresent + 2009 1 + + + + verifyTextPresent + Co-authors + + + + verifyTextPresent + Smith, Sally + + + + verifyTextPresent + 1 + + + + verifyTextPresent + Johnson, Jane + + + + verifyTextPresent + 1 + + + + verifyTextPresent + Zink, Zoe + + + + verifyTextPresent + 1 + + + + comment + Verify that there are no co-investigators yet + + + + clickAndWait + link=Co-Investigator Network + + + + assertTitle + Person Level Visualization + + + + verifyElementPresent + no_coinvestigations diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html index b589f51e..fe52a3b8 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html @@ -89,29 +89,54 @@ VIVO + + comment + Do not add co-investigators to Games and Kids grant + + + + comment + Do not add co-investigators to Child Development grant + + + + comment + Add 1 co-investigator to Future of Children grant + + clickAndWait - link=Site Admin + link=Index assertTitle - VIVO Site Administration + Index to VIVO Contents - - verifyTextPresent - Data Input - - - - select - VClassURI - label=Librarian (core) - clickAndWait - //input[@value='Add individual of this class'] + link=Person + + + + assertTitle + Person + + + + clickAndWait + link=Zink, Zoe + + + + assertTitle + Zink, Zoe + + + + clickAndWait + //h3[@id='co-principalInvestigatorOn']/a/img @@ -120,83 +145,358 @@ - comment - Add Lily Librarian + type + relatedIndLabel + Future + + + click + ui-active-menuitem type - firstName - Lily + startYear + 2007 type - lastName - Librarian + endYear + 2008 clickAndWait submit + + assertTitle + Zink, Zoe + + comment - Edit Lily Librarian to add title - - - - assertTitle - Librarian, Lily + Add 2 co-investigators to Nix Nintendo grant clickAndWait - link=edit this individual + link=Index assertTitle - Individual Control Panel + Index to VIVO Contents clickAndWait - //input[@value='Edit This Individual'] + link=Person assertTitle - Individual Editing Form + Person + + + + clickAndWait + link=Zink, Zoe + + + + assertTitle + Zink, Zoe + + + + clickAndWait + //h3[@id='co-principalInvestigatorOn']/a/img + + + + assertTitle + Edit type - MonikerSelectAlt - Associate Librarian + relatedIndLabel + Nix + + + click + ui-active-menuitem + + + + type + startYear + 2010 clickAndWait - primaryAction + submit assertTitle - Individual Control Panel + Zink, Zoe + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Person + + + + assertTitle + Person + + + + clickAndWait + link=Johnson, Jane + + + + assertTitle + Johnson, Jane + + + + clickAndWait + //h3[@id='co-principalInvestigatorOn']/a/img + + + + assertTitle + Edit + + + + type + relatedIndLabel + Nix + + + click + ui-active-menuitem + + + + type + startYear + 2010 + + + clickAndWait + submit + + + + assertTitle + Johnson, Jane comment - Verify that account was created + Verify co-investigator network is correct + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Faculty Member + + + + assertTitle + Faculty Member + + + + clickAndWait + link=Furter, Frank + + + + assertTitle + Furter, Frank + + + + clickAndWait + link=Co-Investigator Network + + + + assertTitle + Furter, Frank - Person Level Visualization verifyTextPresent - Librarian, Lily + Furter, Frank verifyTextPresent - Associate Librarian + Associate Professor + + + + verifyTextPresent + VIVO profile | Co-investigator network + + + + verifyTextPresent + 3   Joint Grant(s) + + + + verifyTextPresent + 2   Joint Co-investigator(s) + + + + verifyTextPresent + 3 grant(s)
from 2002 to 2011 + + + + verifyTextPresent + 2 co-investigator(s)
from 2002 to 2011 + + + + verifyTextPresent + Grants per year + + + + verifyTextPresent + Co-investigator + + + + verifyTextPresent + Zink, Zoe + + + + verifyTextPresent + 2 + + + + verifyTextPresent + Johnson, Jane + + + + verifyTextPresent + 1 + + + + comment + Verify co-auther network still o.k. + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Faculty Member + + + + assertTitle + Faculty Member + + + + clickAndWait + link=Furter, Frank + + + + assertTitle + Furter, Frank + + + + clickAndWait + link=Co-Author Network + + + + assertTitle + Furter, Frank - Person Level Visualization + + + + verifyTextPresent + 4   Joint Publication(s) + + + + verifyTextPresent + 3   Joint Co-author(s) + + + + verifyTextPresent + 4 publications
from 2002 to 2011 + + + + verifyTextPresent + 3 co-author(s)
from 2002 to 2011 + + + + verifyTextPresent + Zink, Zoe + + + + verifyTextPresent + Johnson, Jane + + + + verifyTextPresent + Smith, Sally diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html index c3fba1d7..a5a17d76 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html @@ -41,7 +41,7 @@ comment - Add Book + Add Grants @@ -131,12 +131,12 @@ comment - Add a book + Add first grant clickAndWait - //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img + //h3[@id='principalInvestigatorOn']/a/img @@ -144,30 +144,20 @@ Edit - - verifyTextPresent - Create publication entry for Furter, Frank - - - - verifyTextPresent - Publication Type - - - - select - typeSelector - label=Book - - - verifyTextPresent - Title - - type relatedIndLabel - Nintendo: Good or Bad for Kids? + Games and Kids: The Impact + + + type + startYear + 2002 + + + type + endYear + 2004 clickAndWait @@ -179,174 +169,14 @@ Furter, Frank - - verifyTextPresent - book - - - - verifyElementPresent - link=Nintendo: Good or Bad for Kids? - - - - verifyTextPresent - Nintendo: Good or Bad for Kids? - - - - clickAndWait - link=Nintendo: Good or Bad for Kids? - - - - assertTitle - Nintendo: Good or Bad for Kids? - - - - clickAndWait - //div[@id='wrapper-content']/section[6]/article[7]/h3/a/img - - - - assertTitle - Edit - - - - select - typeOfNew - label=Publisher (core) - - - clickAndWait - submit - - - - assertTitle - Edit - - - - type - name - Putnam - - - clickAndWait - submit - - - - assertTitle - exact:Nintendo: Good or Bad for Kids? - - - - clickAndWait - //div[@id='wrapper-content']/section[6]/article[8]/h3/a/img - - - - assertTitle - Edit - - - - type - tinymce - New York - - - clickAndWait - submit - - - - assertTitle - exact:Nintendo: Good or Bad for Kids? - - - - clickAndWait - //div[@id='wrapper-content']/section[4]/article/h3/a/img - - - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - - - type - name - 2009 - - - clickAndWait - submit - - - - assertTitle - exact:Nintendo: Good or Bad for Kids? - - comment - Navigate to Frank Furter + Add second grant clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Faculty Member - - - - assertTitle - Faculty Member - - - - clickAndWait - link=Furter, Frank - - - - assertTitle - Furter, Frank - - - - comment - Add an Article - - - - clickAndWait - //h3[@id='selectedPublications']/a/img + //h3[@id='investigatorOn']/a/img @@ -354,20 +184,15 @@ Edit - - select - typeSelector - label=Academic Article - - - click - //form[@id='addPublicationForm']/div/p/label - - type relatedIndLabel - Why Games Are Important to Child Growth + Childhood Development in the 21st Century + + + type + startYear + 2006 clickAndWait @@ -379,194 +204,14 @@ Furter, Frank - - clickAndWait - link=Why Games Are Important to Child Growth - - - - assertTitle - Why Games Are Important to Child Growth - - - - clickAndWait - //h3[@id='issue']/a/img - - - - assertTitle - Edit - - - - assertTitle - Why Games Are Important to Child Growth - - - - clickAndWait - //h3[@id='startPage']/a/img - - - - assertTitle - Edit - - - - type - tinymce - 111 - - - clickAndWait - submit - - - - assertTitle - Why Games Are Important to Child Growth - - - - clickAndWait - //h3[@id='endPage']/a/img - - - - assertTitle - Edit - - - - type - tinymce - 222 - - - clickAndWait - submit - - - - assertTitle - Why Games Are Important to Child Growth - - - - clickAndWait - //h3[@id='publishedIn']/a/img - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Edit - - - - type - name - Childhood Today - - - clickAndWait - submit - - - - assertTitle - Why Games Are Important to Child Growth - - - - clickAndWait - //h3[@id='date/timeValue']/a/img - - - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - - - type - name - 2001 - - - clickAndWait - submit - - - - assertTitle - Why Games Are Important to Child Growth - - comment - Navigate to Frank Furter + Add third grant clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Faculty Member - - - - assertTitle - Faculty Member - - - - clickAndWait - link=Furter, Frank - - - - assertTitle - Furter, Frank - - - - comment - Add a Chapter - - - - clickAndWait - //h3[@id='selectedPublications']/a/img + //h3[@id='co-principalInvestigatorOn']/a/img @@ -574,15 +219,20 @@ Edit - - select - typeSelector - label=Chapter - type relatedIndLabel - Game Wars + Future of Children + + + type + startYear + 2007 + + + type + endYear + 2008 clickAndWait @@ -594,159 +244,14 @@ Furter, Frank - - clickAndWait - link=Game Wars - - - - assertTitle - Game Wars - - - - clickAndWait - //h3[@id='startPage']/a/img - - - - assertTitle - Edit - - - - type - tinymce - 333 - - - clickAndWait - submit - - - - assertTitle - Game Wars - - - - clickAndWait - //h3[@id='endPage']/a/img - - - - assertTitle - Edit - - - - type - tinymce - 444 - - - clickAndWait - submit - - - - assertTitle - Game Wars - - - - clickAndWait - //h3[@id='publishedIn']/a/img - - - - assertTitle - Edit - - - - assertTitle - Game Wars - - - - clickAndWait - //h3[@id='date/timeValue']/a/img - - - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - - - type - name - 2003 - - - clickAndWait - submit - - - - assertTitle - Game Wars - - comment - Navigate to Frank Furter + Add fourth grant clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Faculty Member - - - - assertTitle - Faculty Member - - - - clickAndWait - link=Furter, Frank - - - - assertTitle - Furter, Frank - - - - comment - Add a Conference - - - - clickAndWait - //h3[@id='selectedPublications']/a/img + //h3[@id='co-principalInvestigatorOn']/a/img @@ -754,15 +259,15 @@ Edit - - select - typeSelector - label=Conference Paper - type relatedIndLabel - Games to Promote Growth + Nix Nintendo? + + + type + startYear + 2010 clickAndWait @@ -774,156 +279,16 @@ Furter, Frank - - clickAndWait - link=Games to Promote Growth - - - - assertTitle - Games to Promote Growth - - - - clickAndWait - //h3[@id='presentedAt']/a/img - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Edit - - - - type - name - Game World 2005 - - - clickAndWait - submit - - - - assertTitle - Games to Promote Growth - - - - clickAndWait - //h3[@id='date/timeValue']/a/img - - - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - - - type - name - 2005 - - - clickAndWait - submit - - - - assertTitle - Games to Promote Growth - - comment - Navigate to Frank Furter + Verify Network Display clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Faculty Member - - - - assertTitle - Faculty Member - - - - clickAndWait - link=Furter, Frank - - - - assertTitle - Furter, Frank - - - - comment - Verify Publication and Network Display - - - - verifyTextPresent - 4 publications
within the last 10 years - - - - verifyTextPresent -
Co-Author Network - - - - verifyTextPresent - Co-Investigator Network - - - - verifyElementPresent - link=Co-Author Network - - - - verifyElementPresent link=Co-Investigator Network - - clickAndWait - link=Co-Author Network - - assertTitle Furter, Frank - Person Level Visualization @@ -931,42 +296,12 @@ verifyTextPresent - 0   Joint Publication(s) + 0   Joint Grant(s) verifyTextPresent - 0   Joint Co-author(s) - - - - verifyTextPresent - 4 publications
from 2002 to 2011 - - - - verifyTextPresent - Publications per year - - - - verifyTextPresent - 2001 1 - - - - verifyTextPresent - 2003 1 - - - - verifyTextPresent - 2005 1 - - - - verifyTextPresent - 2009 1 + 0   Joint Co-investigator(s) diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html index c3fba1d7..ef32541a 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html @@ -41,7 +41,7 @@ comment - Add Book + Add publications @@ -389,21 +389,6 @@ Why Games Are Important to Child Growth - - clickAndWait - //h3[@id='issue']/a/img - - - - assertTitle - Edit - - - - assertTitle - Why Games Are Important to Child Growth - - clickAndWait //h3[@id='startPage']/a/img @@ -654,21 +639,6 @@ Game Wars - - clickAndWait - //h3[@id='publishedIn']/a/img - - - - assertTitle - Edit - - - - assertTitle - Game Wars - - clickAndWait //h3[@id='date/timeValue']/a/img @@ -894,16 +864,6 @@ Verify Publication and Network Display - - verifyTextPresent - 4 publications
within the last 10 years - - - - verifyTextPresent -
Co-Author Network - - verifyTextPresent Co-Investigator Network @@ -939,11 +899,6 @@ 0   Joint Co-author(s) - - verifyTextPresent - 4 publications
from 2002 to 2011 - - verifyTextPresent Publications per year @@ -969,6 +924,26 @@ 2009 1 + + comment + Verify there are no co-investigators + + + + clickAndWait + link=Co-Investigator Network + + + + assertTitle + Person Level Visualization + + + + verifyTextPresent + Currently there are no grants for this investigator in the VIVO database. + + comment Log out diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html index 498bc322..d3bc4eb3 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html @@ -111,12 +111,12 @@ comment - Verify that everything else is still there + Verify that everything is there to be deleted verifyTextPresent - research + activities @@ -129,29 +129,34 @@ organizations + + verifyTextPresent + research + + comment - Delete other stuff + Delete all activities clickAndWait - link=Subject Area + link=Agreement assertTitle - Subject Area + Agreement clickAndWait - link=Child Development + link=Childhood Development in the 21st Century assertTitle - Child Development + Childhood Development in the 21st Century @@ -204,6 +209,296 @@ Index to VIVO Contents + + clickAndWait + link=Agreement + + + + assertTitle + Agreement + + + + clickAndWait + link=Future of Children + + + + assertTitle + Future of Children + + + + clickAndWait + link=edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this entity? If in doubt, CANCEL. + + + + pause + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Agreement + + + + assertTitle + Agreement + + + + clickAndWait + link=Games and Kids: The Impact + + + + assertTitle + Games and Kids: The Impact + + + + clickAndWait + link=edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this entity? If in doubt, CANCEL. + + + + pause + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Agreement + + + + assertTitle + Agreement + + + + clickAndWait + link=exact:Nix Nintendo? + + + + assertTitle + exact:Nix Nintendo? + + + + clickAndWait + link=edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this entity? If in doubt, CANCEL. + + + + pause + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + comment + Delete all events + + + + clickAndWait + link=Conference + + + + assertTitle + Conference + + + + clickAndWait + link=Game World 2005 + + + + assertTitle + Game World 2005 + + + + clickAndWait + link=edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this entity? If in doubt, CANCEL. + + + + pause + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + comment + Delete all organizations + + clickAndWait link=Organization @@ -275,23 +570,28 @@ - clickAndWait - link=Organization - - - - assertTitle - Organization + comment + Delete all research clickAndWait - link=Marcel Dekker + link=Academic Article assertTitle - Marcel Dekker + Academic Article + + + + clickAndWait + link=Why Games Are Important to Child Growth + + + + assertTitle + Why Games Are Important to Child Growth @@ -325,8 +625,8 @@ - pause - 5000 + assertTitle + VIVO Site Administration @@ -341,22 +641,22 @@ clickAndWait - link=Conference + link=Book assertTitle - Conference + Book clickAndWait - link=Games and Child Development + link=exact:Nintendo: Good or Bad for Kids? assertTitle - Games and Child Development + exact:Nintendo: Good or Bad for Kids? @@ -390,8 +690,198 @@ - pause - 5000 + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Chapter + + + + assertTitle + Chapter + + + + clickAndWait + link=Game Wars + + + + assertTitle + Game Wars + + + + clickAndWait + link=edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this entity? If in doubt, CANCEL. + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Conference Paper + + + + assertTitle + Conference Paper + + + + clickAndWait + link=Games to Promote Growth + + + + assertTitle + Games to Promote Growth + + + + clickAndWait + link=edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this entity? If in doubt, CANCEL. + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Journal + + + + assertTitle + Journal + + + + clickAndWait + link=Childhood Today + + + + assertTitle + Childhood Today + + + + clickAndWait + link=edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this entity? If in doubt, CANCEL. @@ -471,7 +961,7 @@ verifyTextNotPresent - topics + activities @@ -484,6 +974,11 @@ organizations + + verifyTextNotPresent + research + + comment Log out diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html index ad206024..78573e01 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html @@ -41,7 +41,7 @@ comment - Delete test faculty members + Delete test co-authors/co-investigators @@ -96,7 +96,7 @@ comment - Navigate to index + Verify people are there to be deleted @@ -109,21 +109,11 @@ Index to VIVO Contents - - comment - Verify both people to be deleted are there - - verifyTextPresent people - - verifyTextPresent - Faculty Member - - verifyTextPresent Person @@ -131,77 +121,7 @@ comment - Navigate to first faculty member - - - - clickAndWait - link=Faculty Member - - - - assertTitle - Faculty Member - - - - clickAndWait - link=Furter, Frank - - - - assertTitle - Furter, Frank - - - - clickAndWait - link=edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - comment - Delete first faculty member - - - - click - _delete - - - - assertConfirmation - Are you SURE you want to delete this entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - comment - Navigate to second faculty member + Delete first person @@ -216,22 +136,22 @@ clickAndWait - link=Faculty Member + link=Person assertTitle - Faculty Member + Person clickAndWait - link=Sunny Sony + link=Johnson, Jane assertTitle - Sunny Sony + Johnson, Jane @@ -254,11 +174,6 @@ Individual Editing Form - - comment - Delete second faculty member - - click _delete @@ -281,7 +196,157 @@ comment - Verify both faculty members are gone + Delete second person + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Person + + + + assertTitle + Person + + + + clickAndWait + link=Smith, Sally + + + + assertTitle + Smith, Sally + + + + clickAndWait + link=edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this entity? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + comment + Delete third person + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Person + + + + assertTitle + Person + + + + clickAndWait + link=Zink, Zoe + + + + assertTitle + Zink, Zoe + + + + clickAndWait + link=edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this entity? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + comment + Verify people are all gone @@ -404,11 +469,6 @@ people - - verifyTextNotPresent - Faculty Member - - verifyTextNotPresent Person diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html index ad206024..6595318f 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html @@ -111,7 +111,7 @@ comment - Verify both people to be deleted are there + Verify person to be deleted is there @@ -131,7 +131,7 @@ comment - Navigate to first faculty member + Navigate to faculty member @@ -176,87 +176,7 @@ comment - Delete first faculty member - - - - click - _delete - - - - assertConfirmation - Are you SURE you want to delete this entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - comment - Navigate to second faculty member - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Faculty Member - - - - assertTitle - Faculty Member - - - - clickAndWait - link=Sunny Sony - - - - assertTitle - Sunny Sony - - - - clickAndWait - link=edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - comment - Delete second faculty member + Delete faculty member @@ -400,7 +320,7 @@ - verifyTextNotPresent + verifyTextPresent people @@ -410,7 +330,7 @@ - verifyTextNotPresent + verifyTextPresent Person diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/Suite.html b/utilities/acceptance-tests/suites/CheckVisualizations/Suite.html index 0a30e86e..f9de22e1 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/Suite.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/Suite.html @@ -10,13 +10,11 @@ Test Suite SetDefaultTheme AddTestFaculty -AddTestLibrarian AddPublications AddCoAuthors -AddGrants +AddGrants AddCoInvestigators DeleteTestFaculty -DeleteTestLibrarian DeleteTestCos DeleteIndexStuff From 9ff40d7d64a0b73a235189972763d266db99169f Mon Sep 17 00:00:00 2001 From: hlm7 Date: Tue, 18 Jan 2011 20:30:05 +0000 Subject: [PATCH 048/427] Holly removed 2 unused test cases from the CheckVisualizations test suite. --- .../CheckVisualizations/AddTestLibrarian.html | 269 ------------------ .../DeleteTestLibrarian.html | 239 ---------------- 2 files changed, 508 deletions(-) delete mode 100644 utilities/acceptance-tests/suites/CheckVisualizations/AddTestLibrarian.html delete mode 100644 utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestLibrarian.html diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddTestLibrarian.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddTestLibrarian.html deleted file mode 100644 index 79b98527..00000000 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddTestLibrarian.html +++ /dev/null @@ -1,269 +0,0 @@ - - - - - - -CreateTestLibrarian - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CreateTestLibrarian
commentAdd test Librarian named Lily Librarian
deleteAllVisibleCookies
open/vivo/
assertTitleVIVO
commentMust be logged off to start
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust login as the site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO
clickAndWaitlink=Site Admin
assertTitleVIVO Site Administration
verifyTextPresentData Input
selectVClassURIlabel=Librarian (core)
clickAndWait//input[@value='Add individual of this class']
assertTitleEdit
commentAdd Lily Librarian
typefirstNameLily
typelastNameLibrarian
clickAndWaitsubmit
commentEdit Lily Librarian to add title
assertTitleLibrarian, Lily
clickAndWaitlink=edit this individual
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
typeMonikerSelectAltAssociate Librarian
clickAndWaitprimaryAction
assertTitleIndividual Control Panel
commentVerify that account was created
verifyTextPresentLibrarian, Lily
verifyTextPresentAssociate Librarian
commentVerify Co Networks not showing
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Librarian
assertTitleLibrarian
clickAndWaitlink=Librarian, Lily
assertTitleLibrarian, Lily
verifyTextNotPresentCo-Investigator Network
verifyTextNotPresentCo-Author Network
commentLogout
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
- - diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestLibrarian.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestLibrarian.html deleted file mode 100644 index bac1a876..00000000 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestLibrarian.html +++ /dev/null @@ -1,239 +0,0 @@ - - - - - - -DeleteTestLibrarian - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
DeleteTestLibrarian
commentDelete test person Lily Librarian
deleteAllVisibleCookies
open/vivo/
assertTitleVIVO
commentMust not be logged in
clickAndWaitlink=Log in
assertTitleLog in to VIVO
commentMust log in as site admin
typeloginNametestAdmin
typeloginPasswordPassword
clickAndWaitloginForm
assertTitleVIVO
commentNavigate to Lily Librarian
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
clickAndWaitlink=Librarian
assertTitleLibrarian
clickAndWaitlink=Librarian, Lily
assertTitleLibrarian, Lily
clickAndWaitlink=edit this individual
commentDelete Lily Librarian
assertTitleIndividual Control Panel
clickAndWait//input[@value='Edit This Individual']
assertTitleIndividual Editing Form
click_delete
assertConfirmationAre you SURE you want to delete this entity? If in doubt, CANCEL.
waitForPageToLoad5000
assertTitleVIVO Site Administration
commentVerify that Lily Librarian is indeed gone
clickAndWaitlink=Index
assertTitleIndex to VIVO Contents
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
refreshAndWait10000
verifyTextNotPresentLibrarian
commentLogout
clickAndWaitlink=Home
clickAndWaitlink=Log out
assertTitleVIVO
- - From 2aab0cfd6f60f2726c7ec3ef7013ad8817fa8e14 Mon Sep 17 00:00:00 2001 From: tlw72 Date: Tue, 18 Jan 2011 21:01:37 +0000 Subject: [PATCH 049/427] NIHVIVO-1788 and 1799: fixed welcome message overlap --- themes/wilma/css/wilma.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index 5dffb711..a0d6372e 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -350,12 +350,11 @@ p.password-note{ margin-bottom: 10px; } #welcome-message{ - position:absolute; - width:930px; border: 1px dotted #E2C822; background-color: #FFF9D7; padding: 0.25em; - margin-top:-8px; + margin-bottom: 8px; + margin-top: -8px; } /* HOME SEARCH ------> */ #search-home { From 132df18d29cea296262765deab96d22675ddce5a Mon Sep 17 00:00:00 2001 From: hlm7 Date: Tue, 18 Jan 2011 21:17:08 +0000 Subject: [PATCH 050/427] Holly made change due to chapter field now being editable. --- .../suites/AddPublications/ValidateFields.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html index f3f29848..14945ad1 100644 --- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html +++ b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html @@ -971,7 +971,7 @@ clickAndWait - //div[@id='chapter']/a + //h3[@id='chapter']/a/img @@ -1001,7 +1001,7 @@ clickAndWait - //div[@id='chapter']/a + //h3[@id='chapter']/a/img @@ -2456,7 +2456,7 @@ verifyTextPresent - Marcel Decker Publisher + Marcel Decker Publisher @@ -2476,7 +2476,7 @@ verifyTextPresent - Raising Children in the 21st Century Collection + Raising Children in the 21st Century Collection From 38593ed9742ff4d8eae0b6977897e7067c33ee85 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Tue, 18 Jan 2011 21:21:32 +0000 Subject: [PATCH 051/427] Holly changed another test suite due to chapter being enterable now. --- .../suites/AddPublications/AddChapter.html | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/utilities/acceptance-tests/suites/AddPublications/AddChapter.html b/utilities/acceptance-tests/suites/AddPublications/AddChapter.html index 8b5ce0ea..df2dd51d 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddChapter.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddChapter.html @@ -319,6 +319,31 @@ Nintendo O.K. for Kids + + clickAndWait + //h3[@id='chapter']/a/img + + + + assertTitle + Edit + + + + type + tinymce + 13 + + + clickAndWait + submit + + + + assertTitle + Nintendo O.K. for Kids + + clickAndWait //div[@id='wrapper-content']/section[7]/article[7]/h3/a/img From 9d20a13c18041fa2f6cb1ca104f9147b6788f858 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Tue, 18 Jan 2011 21:31:07 +0000 Subject: [PATCH 052/427] NIHVIVO-1730 Fix error in template variable reference --- .../body/partials/individual/propStatement-dateTimeValue.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl index 47b06195..ad526a59 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl @@ -6,7 +6,7 @@ <#-- No core:dateTime data property assigned. Display a link to the core:DateTimeValue object --> <#if ! statement.dateTime??> - ${dateTimeValueName} (incomplete date/time data) + ${statement.dateTimeValueName} (incomplete date/time data) <#else> ${dt.formatXsdDateTimeLong(statement.dateTime, statement.precision!)} \ No newline at end of file From 500ab0eb0df0361c9dd68ae14c576f452a5412d5 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Tue, 18 Jan 2011 21:46:15 +0000 Subject: [PATCH 053/427] NIHVIVO-1704 Enable jump links after returning to individual profile after submitting an editing form. Pass property all the way down the property display macro chain, so any macro has access to property attributes like name, localname, and uri. Provide PropertyTemplateModel.getLocalName() and PropertyTemplateModel.getUri() for this purpose. --- .../individual/individual--foaf-person.ftl | 22 +++++++++---------- .../freemarker/body/individual/individual.ftl | 6 ++--- .../individual/individual-overview.ftl | 4 ++-- .../partials/individual/individual-setup.ftl | 6 +---- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index 76eee0f6..7b5e191c 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -13,7 +13,7 @@
<#-- Image --> - <@p.imageLinks individual propertyGroups editing "${urls.images}/placeholders/person.thumbnail.jpg" /> + <@p.imageLinks individual propertyGroups editable "${urls.images}/placeholders/person.thumbnail.jpg" />
@@ -73,7 +73,7 @@ <#-- Label --> <#assign label = individual.nameStatement> ${label.value} - <@p.editingLinks label editing /> + <@p.editingLinks label label editable /> <#-- Moniker --> <#if individual.moniker?has_content> @@ -85,10 +85,10 @@ <#-- Positions --> <#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!> <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> -

Positions <@p.addLink positions editing />

+

Positions <@p.addLink positions editable />

<#if positions.statements?has_content> <#-- if there are any statements -->
    - <@p.objectPropertyList positions.statements positions.template editing /> + <@p.objectPropertyList positions positions.statements positions.template editable />
@@ -101,10 +101,10 @@ <#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!> <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#--

Research Areas <@p.addLink researchAreas editing />

--> - <@p.addLinkWithLabel researchAreas editing /> + <@p.addLinkWithLabel researchAreas editable /> <#if researchAreas.statements?has_content> <#-- if there are any statements -->
    - <@p.simpleObjectPropertyList researchAreas editing/> + <@p.simpleObjectPropertyList researchAreas editable/>
diff --git a/productMods/templates/freemarker/body/individual/individual.ftl b/productMods/templates/freemarker/body/individual/individual.ftl index f70db5e9..f9d44d6d 100644 --- a/productMods/templates/freemarker/body/individual/individual.ftl +++ b/productMods/templates/freemarker/body/individual/individual.ftl @@ -11,7 +11,7 @@
<#-- Image --> - <@p.imageLinks individual propertyGroups editing /> + <@p.imageLinks individual propertyGroups editable />
@@ -24,7 +24,7 @@ <#-- Label --> <#assign label = individual.nameStatement> ${label.value} - <@p.editingLinks label editing /> + <@p.editingLinks label label editable /> <#-- Moniker --> <#if individual.moniker?has_content> @@ -50,7 +50,7 @@ <#-- Links --> - <@p.vitroLinks propertyGroups editing /> + <@p.vitroLinks propertyGroups editable />
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl b/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl index 45a3c5f5..5ac61c3f 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl @@ -4,11 +4,11 @@ <#assign overview = propertyGroups.getPropertyAndRemoveFromList("${core}overview")!> <#if overview?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> - <@p.addLinkWithLabel overview editing /> + <@p.addLinkWithLabel overview editable /> <#list overview.statements as statement>

${statement.value} - <@p.editingLinks statement editing /> + <@p.editingLinks overview statement editable />

\ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/individual-setup.ftl b/productMods/templates/freemarker/body/partials/individual/individual-setup.ftl index 6500e021..fb2a2fc2 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-setup.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-setup.ftl @@ -5,11 +5,7 @@ <#import "lib-list.ftl" as l> <#import "lib-properties.ftl" as p> -<#assign editing = individual.showEditingLinks> - -<#assign editingClass> - <#if editing>editing - +<#assign editable = individual.editable> <#assign propertyGroups = individual.propertyList> From eebc3424d765e917c1e334bc7324eca1f8e825b5 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Wed, 19 Jan 2011 00:16:03 +0000 Subject: [PATCH 054/427] Holly made more test case changes due to issue resolution. --- .../AddMuseumArchDetails.html | 2 +- .../AddMuseumVisitingHours.html | 2 +- .../AddEducationBackground.html | 12 +++++----- .../ChangeEducationBackground.html | 24 +++++++++---------- .../CustomEducationForm/CheckPublicView.html | 6 ++--- .../DeleteEducationalBackground.html | 12 +++++----- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumArchDetails.html b/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumArchDetails.html index 2fe74b7d..9cd5abfe 100644 --- a/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumArchDetails.html +++ b/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumArchDetails.html @@ -166,7 +166,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[1]/h3/a/img + //h3[@id='architecturalDetails']/a/img diff --git a/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html b/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html index 622de508..e24a4966 100644 --- a/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html @@ -146,7 +146,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article/h3/a/img + //h3[@id='visitingHours']/a/img diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html index 3c9613a8..e721083d 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html @@ -346,7 +346,7 @@ verifyTextPresent - B.S.in Business Administration, Carroll College 1980 + B.S. in Business Administration, Carroll College 1980 @@ -446,7 +446,7 @@ verifyTextPresent - B.S.in Business Administration, Carroll College 1980 + B.S. in Business Administration, Carroll College 1980 @@ -456,7 +456,7 @@ verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Department 1998 - 2000 @@ -556,7 +556,7 @@ verifyTextPresent - B.S.in Business Administration, Carroll College 1980 + B.S. in Business Administration, Carroll College 1980 @@ -566,7 +566,7 @@ verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Department 1998 - 2000 @@ -576,7 +576,7 @@ verifyTextPresent - M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html index 87c65ddc..264d3d51 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html @@ -136,17 +136,17 @@ verifyTextPresent - B.S.in Business Administration, Carroll College 1980 + B.S. in Business Administration, Carroll College 1980 verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Department 1998 - 2000 verifyTextPresent - M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - @@ -226,17 +226,17 @@ verifyTextPresent - B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 + B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Department 1998 - 2000 verifyTextPresent - M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - @@ -301,17 +301,17 @@ verifyTextPresent - B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 + B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Administration Department 1998 - 2000 verifyTextPresent - M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - @@ -381,17 +381,17 @@ verifyTextPresent - B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 + B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Administration Department 1998 - 2000 verifyTextPresent - M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html index e9b00386..7131bb65 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html @@ -106,17 +106,17 @@ verifyTextPresent - M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Administration Department 1998 - 2000 verifyTextPresent - B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 + B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html index be3acfd6..1bb15029 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html @@ -136,17 +136,17 @@ verifyTextPresent - M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Administration Department 1998 - 2000 verifyTextPresent - B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 + B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 @@ -221,17 +221,17 @@ verifyTextNotPresent - M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - verifyTextNotPresent - M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Department 1998 - 2000 verifyTextNotPresent - B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 + B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 From 2db533b36548e2ca77c51efbc2f38c2482983aab Mon Sep 17 00:00:00 2001 From: hlm7 Date: Wed, 19 Jan 2011 01:12:38 +0000 Subject: [PATCH 055/427] Holly did some additional fine-tuning of the CheckVisualizations test suite. --- .../CheckVisualizations/AddCoAuthors.html | 44 ++++++++++++++++- .../AddCoInvestigators.html | 26 ++-------- .../suites/CheckVisualizations/AddGrants.html | 8 +-- .../CheckVisualizations/AddPublications.html | 49 ++++++++++++------- .../CheckVisualizations/DeleteIndexStuff.html | 27 +++++++++- 5 files changed, 107 insertions(+), 47 deletions(-) diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html index 91f986a9..5478d770 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html @@ -136,7 +136,7 @@ clickAndWait - //h3[@id='authors']/a/img + //h3[@id='informationResourceInAuthorship']/a/img @@ -154,6 +154,16 @@ lastName Smith + + clickAndWait + submit + + + + assertTitle + Edit + + type firstName @@ -206,7 +216,7 @@ clickAndWait - //h3[@id='authors']/a/img + //h3[@id='informationResourceInAuthorship']/a/img @@ -249,6 +259,26 @@ Edit + + clickAndWait + link=Return to Publication + + + + assertTitle + Why Games Are Important to Child Growth + + + + clickAndWait + //h3[@id='informationResourceInAuthorship']/a/img + + + + assertTitle + Edit + + click showAddFormButton @@ -259,6 +289,16 @@ lastName Zink + + clickAndWait + submit + + + + assertTitle + Edit + + type firstName diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html index fe52a3b8..3a3252b1 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html @@ -136,7 +136,7 @@ clickAndWait - //h3[@id='co-principalInvestigatorOn']/a/img + //h3[@id='hasCo-PrincipalInvestigatorRole']/a/img @@ -211,7 +211,7 @@ clickAndWait - //h3[@id='co-principalInvestigatorOn']/a/img + //h3[@id='hasCo-PrincipalInvestigatorRole']/a/img @@ -276,7 +276,7 @@ clickAndWait - //h3[@id='co-principalInvestigatorOn']/a/img + //h3[@id='hasCo-PrincipalInvestigatorRole']/a/img @@ -379,16 +379,6 @@ 2   Joint Co-investigator(s) - - verifyTextPresent - 3 grant(s)
from 2002 to 2011 - - - - verifyTextPresent - 2 co-investigator(s)
from 2002 to 2011 - - verifyTextPresent Grants per year @@ -474,16 +464,6 @@ 3   Joint Co-author(s) - - verifyTextPresent - 4 publications
from 2002 to 2011 - - - - verifyTextPresent - 3 co-author(s)
from 2002 to 2011 - - verifyTextPresent Zink, Zoe diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html index a5a17d76..ffaba76f 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html @@ -136,7 +136,7 @@ clickAndWait - //h3[@id='principalInvestigatorOn']/a/img + //h3[@id='hasPrincipalInvestigatorRole']/a/img @@ -176,7 +176,7 @@ clickAndWait - //h3[@id='investigatorOn']/a/img + //h3[@id='hasInvestigatorRole']/a/img @@ -211,7 +211,7 @@ clickAndWait - //h3[@id='co-principalInvestigatorOn']/a/img + //h3[@id='hasCo-PrincipalInvestigatorRole']/a/img @@ -251,7 +251,7 @@ clickAndWait - //h3[@id='co-principalInvestigatorOn']/a/img + //h3[@id='hasCo-PrincipalInvestigatorRole']/a/img diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html index ef32541a..9e6ad6d7 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html @@ -346,7 +346,7 @@ clickAndWait - //h3[@id='selectedPublications']/a/img + //h3[@id='authorInAuthorship']/a/img @@ -359,11 +359,6 @@ typeSelector label=Academic Article - - click - //form[@id='addPublicationForm']/div/p/label - - type relatedIndLabel @@ -391,7 +386,7 @@ clickAndWait - //h3[@id='startPage']/a/img + //h3[@id='pageStart']/a/img @@ -416,7 +411,7 @@ clickAndWait - //h3[@id='endPage']/a/img + //h3[@id='pageEnd']/a/img @@ -441,7 +436,7 @@ clickAndWait - //h3[@id='publishedIn']/a/img + //h3[@id='hasPublicationVenue']/a/img @@ -476,7 +471,7 @@ clickAndWait - //h3[@id='date/timeValue']/a/img + //h3[@id='dateTimeValue']/a/img @@ -551,7 +546,7 @@ clickAndWait - //h3[@id='selectedPublications']/a/img + //h3[@id='authorInAuthorship']/a/img @@ -591,7 +586,7 @@ clickAndWait - //h3[@id='startPage']/a/img + //h3[@id='pageStart']/a/img @@ -616,7 +611,27 @@ clickAndWait - //h3[@id='endPage']/a/img + //h3[@id='chapter']/a/img + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Game Wars + + + + clickAndWait + //h3[@id='pageEnd']/a/img @@ -641,7 +656,7 @@ clickAndWait - //h3[@id='date/timeValue']/a/img + //h3[@id='dateTimeValue']/a/img @@ -716,7 +731,7 @@ clickAndWait - //h3[@id='selectedPublications']/a/img + //h3[@id='authorInAuthorship']/a/img @@ -791,7 +806,7 @@ clickAndWait - //h3[@id='date/timeValue']/a/img + //h3[@id='dateTimeValue']/a/img @@ -941,7 +956,7 @@ verifyTextPresent - Currently there are no grants for this investigator in the VIVO database. + Currently there are no grants for this investigator in the VIVO database. diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html index d3bc4eb3..7a3bc7f1 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html @@ -624,6 +624,11 @@ Are you SURE you want to delete this entity? If in doubt, CANCEL. + + pause + 5000 + + assertTitle VIVO Site Administration @@ -656,7 +661,7 @@ assertTitle - exact:Nintendo: Good or Bad for Kids? + Nintendo: Good or Bad for Kids? @@ -689,6 +694,11 @@ Are you SURE you want to delete this entity? If in doubt, CANCEL. + + pause + 5000 + + assertTitle VIVO Site Administration @@ -754,6 +764,11 @@ Are you SURE you want to delete this entity? If in doubt, CANCEL. + + pause + 5000 + + assertTitle VIVO Site Administration @@ -819,6 +834,11 @@ Are you SURE you want to delete this entity? If in doubt, CANCEL. + + pause + 5000 + + assertTitle VIVO Site Administration @@ -884,6 +904,11 @@ Are you SURE you want to delete this entity? If in doubt, CANCEL. + + pause + 5000 + + assertTitle VIVO Site Administration From 99936865918e3d3ec6d8b4db6eb300b08227caa9 Mon Sep 17 00:00:00 2001 From: tlw72 Date: Wed, 19 Jan 2011 14:53:18 +0000 Subject: [PATCH 056/427] have the welcome message fade out --- themes/wilma/css/wilma.css | 7 ++++++- themes/wilma/templates/menu.ftl | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index a0d6372e..d48263bd 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -354,7 +354,12 @@ p.password-note{ background-color: #FFF9D7; padding: 0.25em; margin-bottom: 8px; - margin-top: -8px; +} +#welcome-msg-container{ + margin-bottom: 8px; + margin-top: -10px; + margin-right:-10px; + height:34px; } /* HOME SEARCH ------> */ #search-home { diff --git a/themes/wilma/templates/menu.ftl b/themes/wilma/templates/menu.ftl index 86de0d48..b002fc79 100644 --- a/themes/wilma/templates/menu.ftl +++ b/themes/wilma/templates/menu.ftl @@ -11,8 +11,8 @@
<#if flash?has_content> <#if flash?starts_with("Welcome") > -
+ diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java index ac0f0f74..6d8c1ef6 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java @@ -164,13 +164,15 @@ public class EntityPublicationCountRequestHandler implements VitroRequest vitroRequest, String entityURI) { Portal portal = vitroRequest.getPortal(); + String visualization = "ENTITY_PUB_COUNT"; String standaloneTemplate = "entityComparisonErrorActivator.ftl"; Map body = new HashMap(); body.put("portalBean", portal); body.put("title", "Temporal Graph Visualization"); body.put("organizationURI", entityURI); - + body.put("visualization", visualization); + return new TemplateResponseValues(standaloneTemplate, body); } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java index 924d3e20..f85d66f9 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java @@ -163,12 +163,14 @@ public class EntityGrantCountRequestHandler implements VitroRequest vitroRequest, String entityURI) { Portal portal = vitroRequest.getPortal(); + String visualization = "ENTITY_GRANT_COUNT"; String standaloneTemplate = "entityComparisonErrorActivator.ftl"; Map body = new HashMap(); body.put("portalBean", portal); body.put("title", "Temporal Graph Visualization"); body.put("organizationURI", entityURI); + body.put("visualization", visualization); return new TemplateResponseValues(standaloneTemplate, body); From 6af3fee6b1418603586245df51f1c6ca1eae8c8d Mon Sep 17 00:00:00 2001 From: cdtank Date: Wed, 19 Jan 2011 23:47:52 +0000 Subject: [PATCH 065/427] 1. Changed layout per Katy's suggestion for Temporal Graph Vis. 2. Refactored javascript code for Temporal graph vis. 3. Fixed couple of bugs including the one in which an entity had only one publication the line graph showed weird behavior. 4. Modified the behavior of the temporal linear graph to always try to display last 10 years at least on the line graph. --- .../visualization/entitycomparison/layout.css | 28 ++++-- .../entitycomparison/constants.js | 16 ++-- .../jquery_plugins/datatable/demo_table.css | 23 ++++- .../js/visualization/entitycomparison/util.js | 96 ++++++++++++++----- .../entityComparisonStandaloneActivator.ftl | 12 ++- 5 files changed, 127 insertions(+), 48 deletions(-) diff --git a/productMods/css/visualization/entitycomparison/layout.css b/productMods/css/visualization/entitycomparison/layout.css index 56955d43..a48a85cb 100644 --- a/productMods/css/visualization/entitycomparison/layout.css +++ b/productMods/css/visualization/entitycomparison/layout.css @@ -13,17 +13,25 @@ } a.temporalGraphLinks { - margin-top: 10px; /*float:right;*/ - height: 20px; - text-decoration: none; - width: 30%; - /*margin: 0 1% 0 1%;*/ - background-color: #EAEAEA; - text-align: center; - padding: 3px; - padding-top: 4px; + background-color: #2485AE; + color: white; cursor: pointer; + font-weight: bold; + height: 20px; + margin-top: 10px; + padding: 4px 3px 3px; + text-align: center; + text-decoration: none; +} + +#paginated-table-footer { + margin-top: 10px; + text-align: right; +} + +#legend-row-header a { + background-color: #878787; } #reset-search { @@ -98,6 +106,8 @@ a.temporalGraphLinks { .small-arrows { font-size: 0.9em; padding: 0 !important; + text-decoration: none; + vertical-align: top; } #header-entity-label { diff --git a/productMods/js/visualization/entitycomparison/constants.js b/productMods/js/visualization/entitycomparison/constants.js index ccfe9cda..9c77d1d5 100644 --- a/productMods/js/visualization/entitycomparison/constants.js +++ b/productMods/js/visualization/entitycomparison/constants.js @@ -10,6 +10,7 @@ var LIGHT_RED = "#FB8072"; var DARK_RED = "#520000"; var SKY_BLUE = "#80B1D3"; var DARK_BLUE = "#80B1D3"; +var NAVY_BLUE = "#003366"; var LIGHT_BLUE = "#3399FF"; var ORANGE = "#FDB462"; var DARK_ORANGE = "#FF9900"; @@ -21,21 +22,22 @@ var LIGHT_GREY = "#D9D9D9"; var PURPLE = "#BC80BD"; var DARK_PURPLE = "#6600CC"; var PINK_PURPLE = "#CC00CC"; +var HOT_PINK = "#FF00B4"; +var MEHENDI_GREEN = "#7A7900"; -var colorConstantQueue = [ DARK_BLUE, DARK_TURQUOISE, - LIGHT_BLUE, DARK_GREEN, - VIBRANT_GREEN, DARK_PURPLE, - PINK_PURPLE, DARK_ORANGE, - DARK_RED, RED ]; +var colorConstantQueue = [ LIGHT_BLUE, DARK_ORANGE, VIBRANT_GREEN, + NAVY_BLUE, RED, PINK_PURPLE, + DARK_TURQUOISE, MEHENDI_GREEN, HOT_PINK, + DARK_RED ]; var freeColors = colorConstantQueue.slice(); var globalDateObject = new Date(); var year = { - min: globalDateObject.getFullYear() - 10, + min: globalDateObject.getFullYear() - 9, max: globalDateObject.getFullYear(), - globalMin: globalDateObject.getFullYear() - 10, + globalMin: globalDateObject.getFullYear() - 9, globalMax: globalDateObject.getFullYear() }; diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css b/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css index fea3c9e8..17fd8289 100644 --- a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css +++ b/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css @@ -1,25 +1,36 @@ @CHARSET "UTF-8"; .filterInfo { - /*font-size: 0.9em;*/ - display: inline-block; + float:left; + margin-top: 15px; +} + +.filterInfo div { + font-weight: bold; } .paginate_button { - text-decoration: underline; + /*text-decoration: underline;*/ } .paginatedtabs { /* border-top: 1px #3D454E solid; text-align: center;*/ margin-bottom: 10px; - padding-top: 10px; font-size: 0.9em; + /*display: inline-block;*/ + float:right; + margin-top: 15px; } .paginatedtabs span { padding-right: 5px; cursor: pointer; + color: #2485AE; +} + +.paginate-nav-text { + text-decoration: underline; } .datatablewrapper td, th { @@ -41,6 +52,10 @@ text-align: left; } +.table-separator { + clear: both; +} + .datatablewrapper th { border-top: 1px #3D454E solid; background:#F1F2ee; diff --git a/productMods/js/visualization/entitycomparison/util.js b/productMods/js/visualization/entitycomparison/util.js index 1093e7f8..286b2e31 100644 --- a/productMods/js/visualization/entitycomparison/util.js +++ b/productMods/js/visualization/entitycomparison/util.js @@ -7,9 +7,9 @@ $.fn.dataTableExt.oPagination.gmail_style = { "fnInit": function ( oSettings, nPaging, fnCallbackDraw ) { + //var nInfo = document.createElement( 'div' ); var nFirst = document.createElement( 'span' ); var nPrevious = document.createElement( 'span' ); - var nInfo = document.createElement( 'div' ); var nNext = document.createElement( 'span' ); var nLast = document.createElement( 'span' ); @@ -20,10 +20,10 @@ $.fn.dataTableExt.oPagination.gmail_style = { nLast.innerHTML = oSettings.oLanguage.oPaginate.sLast; */ - nFirst.innerHTML = "<< First"; - nPrevious.innerHTML = "< Prev"; - nNext.innerHTML = "Next >"; - nLast.innerHTML = "Last >>"; + nFirst.innerHTML = "« First"; + nPrevious.innerHTML = "‹ Prev"; + nNext.innerHTML = "Next›"; + nLast.innerHTML = "Last»"; var oClasses = oSettings.oClasses; nFirst.className = oClasses.sPageButton+" "+oClasses.sPageFirst; @@ -31,9 +31,9 @@ $.fn.dataTableExt.oPagination.gmail_style = { nNext.className= oClasses.sPageButton+" "+oClasses.sPageNext; nLast.className = oClasses.sPageButton+" "+oClasses.sPageLast; + //nPaging.appendChild( nInfo ); nPaging.appendChild( nFirst ); nPaging.appendChild( nPrevious ); - nPaging.appendChild( nInfo ); nPaging.appendChild( nNext ); nPaging.appendChild( nLast ); @@ -76,7 +76,7 @@ $.fn.dataTableExt.oPagination.gmail_style = { nPaging.setAttribute( 'id', oSettings.sTableId+'_paginate' ); nFirst.setAttribute( 'id', oSettings.sTableId+'_first' ); nPrevious.setAttribute( 'id', oSettings.sTableId+'_previous' ); - nInfo.setAttribute( 'id', 'infoContainer' ); + //nInfo.setAttribute( 'id', 'infoContainer' ); nNext.setAttribute( 'id', oSettings.sTableId+'_next' ); nLast.setAttribute( 'id', oSettings.sTableId+'_last' ); } @@ -239,8 +239,8 @@ function init(graphContainer) { var defaultFlotOptions = { xaxis : { - min : 1996, - max : 2008, + min : globalDateObject.getFullYear() - 9, + max : globalDateObject.getFullYear(), tickDecimals : 0, tickSize : 2 }, @@ -283,12 +283,14 @@ function unStuffZerosFromLineGraphs(jsonObject, year) { calcZeroLessMinAndMax(jsonObject, year); var currentMinYear = year.globalMin, currentMaxYear = year.globalMax; + + var normalizedYearRange = getNormalizedYearRange(); $.each(jsonObject, function(key, val) { var i = 0; for (i = 0; i < val.data.length; i++) { - if (((val.data[i][0] < currentMinYear) || (val.data[i][0] > currentMaxYear)) + if (((val.data[i][0] < normalizedYearRange.normalizedMinYear) || (val.data[i][0] > normalizedYearRange.normalizedMaxYear)) && val.data[i][1] == 0) { val.data.splice(i, 1); @@ -318,6 +320,43 @@ function unStuffZerosFromLineGraph(jsonObject) { } } + +/** + * This is used to normalize the year range for the currently selected entities to always + * display the last 10 years worth of data points. + * + */ +function getNormalizedYearRange() { + + /* + * This is done to make sure that at least last 10 years worth of data points + * can be displayed. + * */ + if (globalDateObject.getFullYear() < year.globalMax) { + + inferredMaxYear = year.globalMax; + + } else { + + inferredMaxYear = globalDateObject.getFullYear(); + } + + if (globalDateObject.getFullYear() - 9 > year.globalMin) { + + inferredMinYear = year.globalMin; + + } else { + + inferredMinYear = globalDateObject.getFullYear() - 9; + } + + return { + normalizedMinYear: inferredMinYear, + normalizedMaxYear: inferredMaxYear, + normalizedRange: inferredMaxYear - inferredMinYear + }; +} + /** * stuffZerosIntoLineGraphs is used to fill discontinuities in data points. For * example, if a linegraph has the following data points [1990, @@ -336,22 +375,22 @@ function stuffZerosIntoLineGraphs(jsonObject, year) { calcZeroLessMinAndMax(jsonObject, year); - var arrayOfMinAndMaxYears = [ year.globalMin, year.globalMax ]; - + var normalizedYearRange = getNormalizedYearRange(); + $.each(jsonObject, function(key, val) { - var position = arrayOfMinAndMaxYears[0], i = 0; + var position = normalizedYearRange.normalizedMinYear, i = 0; //console.log(key, val, position, (arrayOfMinAndMaxYears[1] - arrayOfMinAndMaxYears[0]) + 1); - for (i = 0; i < (arrayOfMinAndMaxYears[1] - arrayOfMinAndMaxYears[0]) + 1; i++) { + for (i = 0; i < normalizedYearRange.normalizedRange + 1; i++) { //console.log("val.data[i]", val.data[i]); if (val.data[i]) { if (val.data[i][0] != position - && position <= arrayOfMinAndMaxYears[1]) { + && position <= normalizedYearRange.normalizedMaxYear) { val.data.splice(i, 0, [ position, 0 ]); } } @@ -525,6 +564,9 @@ function setLineWidthAndTickSize(yearRange, flotOptions) { } else if (yearRange > 15 && yearRange < 70) { flotOptions.series.lines.lineWidth = 2; flotOptions.xaxis.tickSize = 5; + } else if (yearRange == 0 ) { + flotOptions.series.lines.lineWidth = 3; + flotOptions.xaxis.tickSize = 1; } else { flotOptions.series.lines.lineWidth = 1; flotOptions.xaxis.tickSize = 10; @@ -800,12 +842,13 @@ function removeEntityUnChecked(renderedObjects, entity){ //remove the entity that is unchecked var ii = 0; while (ii < renderedObjects.length) { + if (renderedObjects[ii].label == entity.label) { unStuffZerosFromLineGraph(renderedObjects[ii]); renderedObjects.splice(ii, 1); } else { ii++; - } + } } unStuffZerosFromLineGraphs(renderedObjects, year); @@ -868,16 +911,23 @@ function updateCounter(){ } function displayLineGraphs(){ + //plot all we got if (renderedObjects.length == 0) { + init(graphContainer); + } else { + removeUnknowns(renderedObjects); $.plot(graphContainer, renderedObjects, FlotOptions); insertBackUnknowns(renderedObjects); + } } + + function removeCheckBoxFromGlobalSet(checkbox){ //remove checkbox object from the globals var value = $(checkbox).attr("value"); @@ -966,7 +1016,7 @@ function prepareTableForDataTablePagination(jsonData){ var searchBarParentContainerDIVClass = "searchbar"; var entityListTable = $('#datatable').dataTable({ - "sDom": '<"' + searchBarParentContainerDIVClass + '"f><"filterInfo"i><"paginatedtabs"p><"datatablewrapper"t>', + "sDom": '<"' + searchBarParentContainerDIVClass + '"f><"filterInfo"i><"paginatedtabs"p><"table-separator"><"datatablewrapper"t>', "aaSorting": [ [2, "desc"] ], @@ -974,7 +1024,7 @@ function prepareTableForDataTablePagination(jsonData){ "iDisplayLength": 10, "bInfo": true, "oLanguage": { - "sInfo": "_START_ - _END_ of _TOTAL_", + "sInfo": "Records _START_ - _END_ of _TOTAL_", "sInfoEmpty": "No matching entities found", "sInfoFiltered": "", }, @@ -999,8 +1049,10 @@ function prepareTableForDataTablePagination(jsonData){ entityListTable.fnFilter(""); }); + /* var filterInfo = $(".filterInfo").detach(); $("#infoContainer").append(filterInfo); + */ } @@ -1108,8 +1160,6 @@ function enableUncheckedEntities(){ function checkIfColorLimitIsReached(){ -// console.log(getSize(labelToCheckedEntities)); - if (getSize(labelToCheckedEntities) >= 10) { disableUncheckedEntities(); } else { @@ -1126,10 +1176,8 @@ function setTickSizeOfAxes(){ checkedLabelToEntityRecord[index] = labelToEntityRecord[index]; }); - //calcMinandMaxYears(checkedLabelToEntityRecord, year); - //yearRange = (year.max - year.min); - yearRange = (year.globalMax - year.globalMin); + var normalizedYearRange = getNormalizedYearRange(); - setLineWidthAndTickSize(yearRange, FlotOptions); + setLineWidthAndTickSize(normalizedYearRange.normalizedRange, FlotOptions); setTickSizeOfYAxis(calcMaxWithinComparisonParameter(checkedLabelToEntityRecord), FlotOptions); } \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl index 92582527..1110b92e 100644 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl @@ -248,7 +248,7 @@ var organizationLabel = '${organizationLabel}'; */ $.each($("input.if_clicked_on_school"), function(index, checkbox) { - if (index > 0) { + if (index > 2) { return false; } @@ -306,8 +306,9 @@ var organizationLabel = '${organizationLabel}';

Who do you want to compare?

-
+ <#--
@@ -329,8 +330,11 @@ var organizationLabel = '${organizationLabel}';

You have selected 0 of a maximum - 10 schools to compare. - Clear

+ 10 schools to compare. + + Clear + +

From 7739c19ad489cc9eef44488f2d29032445c50b1c Mon Sep 17 00:00:00 2001 From: hlm7 Date: Wed, 19 Jan 2011 23:55:30 +0000 Subject: [PATCH 066/427] Holly did some more tweaking due to JIRA issues being resolved. --- .../suites/AddNonPersonThings/CreateOrganization.html | 2 +- .../acceptance-tests/suites/CreatePeople/AddFacultyInfo.html | 5 +++++ .../suites/CreatePeople/AddFacultyInfo2.html | 5 +++++ .../suites/CreatePeople/DeleteFacultyInfo.html | 5 +++++ .../suites/CreatePeople/EditFacultyInfo.html | 5 +++++ 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html index c92f89d2..cdc892b2 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html @@ -1056,7 +1056,7 @@ type - name + startField.year 1959 diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html index 5f32a0cb..ce44d4f3 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html @@ -34,6 +34,11 @@ + + setTimeout + 200000 + + comment Add all available fields that aren't tested elsewhere diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html index d763b1a1..016d414a 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html @@ -34,6 +34,11 @@ + + setTimeout + 200000 + + comment Add a second value for fields entered via AddFacultyInfo diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html index e24c790d..020d2eea 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html @@ -34,6 +34,11 @@ + + setTimeout + 200000 + + comment Delete all fields added by *FacultyInfo test casesd diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index 203b0d55..95a5c86f 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -34,6 +34,11 @@ + + setTimeout + 200000 + + comment Edit all available fields that aren't tested elsewhere From fa2f4be08784360bd26431527fe25142a576a2a4 Mon Sep 17 00:00:00 2001 From: cdtank Date: Thu, 20 Jan 2011 00:18:51 +0000 Subject: [PATCH 067/427] 1. Fixed a design bug for IE where the y-axis legen did not get the padding-top. 2. Reflected the changes for publication version of temporal-graphs into grants version. --- .../visualization/entitycomparison/layout.css | 2 +- ...entityComparisonGrantsStandaloneActivator.ftl | 16 ++++++---------- .../entityComparisonStandaloneActivator.ftl | 8 ++------ 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/productMods/css/visualization/entitycomparison/layout.css b/productMods/css/visualization/entitycomparison/layout.css index a48a85cb..48741d86 100644 --- a/productMods/css/visualization/entitycomparison/layout.css +++ b/productMods/css/visualization/entitycomparison/layout.css @@ -48,7 +48,7 @@ a.temporalGraphLinks { display: block; height: 150px; text-align: center; - padding-top: 50px; + margin-top: 50px; position: absolute !important; } diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl index e997ace9..45d3a554 100644 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl @@ -200,14 +200,6 @@ var organizationLabel = '${organizationLabel}'; prepareTableForDataTablePagination(jsonData); setEntityLevel(); - /* - calcMinandMaxYears(labelToEntityRecord, year); - yearRange = (year.max - year.min); - - setLineWidthAndTickSize(yearRange, FlotOptions); - setTickSizeOfYAxis(calcMaxOfComparisonParameter(labelToEntityRecord), FlotOptions); - */ - $(".disabled-checkbox-event-receiver").live("click", function () { if ($(this).next().is(':disabled')) { @@ -313,8 +305,9 @@ var organizationLabel = '${organizationLabel}';

Who do you want to compare?

-
+ <#--
@@ -337,7 +330,10 @@ var organizationLabel = '${organizationLabel}';

You have selected 0 of a maximum 10 schools to compare. - Clear

+ + Clear + +

diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl index 1110b92e..2db6a04c 100644 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl @@ -141,13 +141,9 @@ var organizationLabel = '${organizationLabel}'; } }); - //console.log("parse jaon", jQuery.parseJSON(jsonString)); - - //parse the json object and pass it to loadData + //parse the json object and pass it to loadData jsonObject.prepare(jQuery.parseJSON(jsonString)); - - //console.log(jsonObject); - + function performEntityCheckboxUnselectedActions(entity, checkboxValue, checkbox) { removeUsedColor(entity); From e02cb9d26a45860c45eac0e7829c01af6486e8e0 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Thu, 20 Jan 2011 15:20:49 +0000 Subject: [PATCH 068/427] NIHVIVO-1633 Handling of invalid custom list view configs --- .../listViewConfig-educationalTraining.xml | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/productMods/config/listViewConfig-educationalTraining.xml b/productMods/config/listViewConfig-educationalTraining.xml index 22397751..bb86abc3 100644 --- a/productMods/config/listViewConfig-educationalTraining.xml +++ b/productMods/config/listViewConfig-educationalTraining.xml @@ -18,22 +18,22 @@ GRAPH ?g1 { ?subject ?property ?edTraining LET (?edTrainingName := afn:localName(?edTraining)) } - OPTIONAL { GRAPH ?g2 { ?edTraining core:trainingAtOrganization ?org . - ?org rdfs:label ?orgName . } + OPTIONAL { GRAPH ?g2 { ?edTraining core:trainingAtOrganization ?org } + GRAPH ?g3 { ?org rdfs:label ?orgName } } - OPTIONAL { GRAPH ?g3 { ?edTraining core:degreeEarned ?degree } - OPTIONAL { GRAPH ?g4 { ?degree rdfs:label ?degreeName } } - OPTIONAL { GRAPH ?g5 { ?degree core:abbreviation ?degreeAbbr } } + OPTIONAL { GRAPH ?g4 { ?edTraining core:degreeEarned ?degree } + OPTIONAL { GRAPH ?g5 { ?degree rdfs:label ?degreeName } } + OPTIONAL { GRAPH ?g6 { ?degree core:abbreviation ?degreeAbbr } } } - OPTIONAL { GRAPH ?g6 { ?edTraining core:majorField ?majorField } } - OPTIONAL { GRAPH ?g7 { ?edTraining core:departmentOrSchool ?deptOrSchool } } - OPTIONAL { GRAPH ?g8 { ?edTraining core:supplementalInformation ?info } } - OPTIONAL { GRAPH ?g9 { ?edTraining core:dateTimeInterval ?dateTimeInterval } - OPTIONAL { GRAPH ?g10 { ?dateTimeInterval core:start ?dateTimeStartValue } - GRAPH ?g11 { ?dateTimeStartValue core:dateTime ?dateTimeStart } + OPTIONAL { GRAPH ?g7 { ?edTraining core:majorField ?majorField } } + OPTIONAL { GRAPH ?g8 { ?edTraining core:departmentOrSchool ?deptOrSchool } } + OPTIONAL { GRAPH ?g9 { ?edTraining core:supplementalInformation ?info } } + OPTIONAL { GRAPH ?g10 { ?edTraining core:dateTimeInterval ?dateTimeInterval } + OPTIONAL { GRAPH ?g11 { ?dateTimeInterval core:start ?dateTimeStartValue } + GRAPH ?g12 { ?dateTimeStartValue core:dateTime ?dateTimeStart } } - OPTIONAL { GRAPH ?g12 { ?dateTimeInterval core:end ?dateTimeEndValue } - GRAPH ?g13 { ?dateTimeEndValue core:dateTime ?dateTimeEnd } + OPTIONAL { GRAPH ?g13 { ?dateTimeInterval core:end ?dateTimeEndValue } + GRAPH ?g14 { ?dateTimeEndValue core:dateTime ?dateTimeEnd } } } } ORDER BY DESC(?dateTimeEnd) DESC(?dateTimeStart) @@ -54,31 +54,31 @@ GRAPH ?g1 { ?subject ?property ?edTraining LET (?edTrainingName := afn:localName(?edTraining)) } - OPTIONAL { GRAPH ?g2 { ?edTraining core:trainingAtOrganization ?org . - ?org rdfs:label ?orgName } - OPTIONAL { GRAPH ?g3 { ?subclass rdfs:subClassOf core:Organization } - GRAPH ?g4 { ?org a ?subclass } - FILTER (?g4 != <http://vitro.mannlib.cornell.edu/default/inferred-tbox> && - ?g4 != <http://vitro.mannlib.cornell.edu/default/vitro-kb-inf> ) + OPTIONAL { GRAPH ?g2 { ?edTraining core:trainingAtOrganization ?org } + GRAPH ?g3 { ?org rdfs:label ?orgName } + OPTIONAL { GRAPH ?g4 { ?subclass rdfs:subClassOf core:Organization } + GRAPH ?g5 { ?org a ?subclass } + FILTER (?g5 != <http://vitro.mannlib.cornell.edu/default/inferred-tbox> && + ?g5 != <http://vitro.mannlib.cornell.edu/default/vitro-kb-inf> ) } } - OPTIONAL { GRAPH ?g5 { ?edTraining core:degreeEarned ?degree } - OPTIONAL { GRAPH ?g6 { ?degree rdfs:label ?degreeName } } - OPTIONAL { GRAPH ?g7 { ?degree core:abbreviation ?degreeAbbr } } + OPTIONAL { GRAPH ?g6 { ?edTraining core:degreeEarned ?degree } + OPTIONAL { GRAPH ?g7 { ?degree rdfs:label ?degreeName } } + OPTIONAL { GRAPH ?g8 { ?degree core:abbreviation ?degreeAbbr } } } - OPTIONAL { GRAPH ?g8 { ?edTraining core:majorField ?majorField } } - OPTIONAL { GRAPH ?g9 { ?edTraining core:departmentOrSchool ?deptOrSchool } } - OPTIONAL { GRAPH ?g10 { ?edTraining core:supplementalInformation ?info } } - OPTIONAL { GRAPH ?g11 { ?edTraining core:dateTimeInterval ?dateTimeInterval } - OPTIONAL { GRAPH ?g12 { ?dateTimeInterval core:start ?dateTimeStartValue } - GRAPH ?g13 { ?dateTimeStartValue core:dateTime ?dateTimeStart } + OPTIONAL { GRAPH ?g9 { ?edTraining core:majorField ?majorField } } + OPTIONAL { GRAPH ?g10 { ?edTraining core:departmentOrSchool ?deptOrSchool } } + OPTIONAL { GRAPH ?g11 { ?edTraining core:supplementalInformation ?info } } + OPTIONAL { GRAPH ?g12 { ?edTraining core:dateTimeInterval ?dateTimeInterval } + OPTIONAL { GRAPH ?g13 { ?dateTimeInterval core:start ?dateTimeStartValue } + GRAPH ?g14 { ?dateTimeStartValue core:dateTime ?dateTimeStart } } - OPTIONAL { GRAPH ?g14 { ?dateTimeInterval core:end ?dateTimeEndValue } - GRAPH ?g15 { ?dateTimeEndValue core:dateTime ?dateTimeEnd } + OPTIONAL { GRAPH ?g15 { ?dateTimeInterval core:end ?dateTimeEndValue } + GRAPH ?g16 { ?dateTimeEndValue core:dateTime ?dateTimeEnd } } } } ORDER BY ?subclass DESC(?dateTimeEnd) DESC(?dateTimeStart) - + From 270b9ef984fb33cc6268880225b4c7efcab24a6f Mon Sep 17 00:00:00 2001 From: jeb228 Date: Thu, 20 Jan 2011 15:51:07 +0000 Subject: [PATCH 069/427] Use correct capitalization in the call to add "getURLParam.js" --- .../freemarker/body/individual/individual--foaf-person.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index 7b5e191c..be8d4ca7 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -150,7 +150,7 @@ ${stylesheets.add("/css/individual/individual.css")} <#-- RY Figure out which of these scripts really need to go into the head, and which are needed at all (e.g., tinyMCE??) --> -${headScripts.add("/js/jquery_plugins/getUrlParam.js", +${headScripts.add("/js/jquery_plugins/getURLParam.js", "/js/jquery_plugins/colorAnimations.js", "/js/jquery_plugins/jquery.form.js", "/js/tiny_mce/tiny_mce.js", From 2a0d21ad3cd781c922f67de522aca51ffae745d8 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Thu, 20 Jan 2011 16:51:14 +0000 Subject: [PATCH 070/427] Fix typo in ARQ function call --- productMods/config/listViewConfig-educationalTraining.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/productMods/config/listViewConfig-educationalTraining.xml b/productMods/config/listViewConfig-educationalTraining.xml index bb86abc3..7e8fab4e 100644 --- a/productMods/config/listViewConfig-educationalTraining.xml +++ b/productMods/config/listViewConfig-educationalTraining.xml @@ -16,7 +16,7 @@ ?dateTimeStart ?dateTimeEnd WHERE { GRAPH ?g1 { ?subject ?property ?edTraining - LET (?edTrainingName := afn:localName(?edTraining)) + LET (?edTrainingName := afn:localname(?edTraining)) } OPTIONAL { GRAPH ?g2 { ?edTraining core:trainingAtOrganization ?org } GRAPH ?g3 { ?org rdfs:label ?orgName } @@ -52,7 +52,7 @@ ?dateTimeStart ?dateTimeEnd WHERE { GRAPH ?g1 { ?subject ?property ?edTraining - LET (?edTrainingName := afn:localName(?edTraining)) + LET (?edTrainingName := afn:localname(?edTraining)) } OPTIONAL { GRAPH ?g2 { ?edTraining core:trainingAtOrganization ?org } GRAPH ?g3 { ?org rdfs:label ?orgName } From 1a36693cb18a51ff89c4b944b0223224c15de1de Mon Sep 17 00:00:00 2001 From: cdtank Date: Thu, 20 Jan 2011 16:55:55 +0000 Subject: [PATCH 071/427] 1. Fixed the bug NIHVIVO-1803. 2. Changed the code/style that shows/hides collaborator links (co-pi & co-author n/ws) for a person, so that the code that will check if any publications/grants are attached to a person can manipulate visibility of these links. --- productMods/css/visualization/visualization.css | 8 ++------ .../individual-sparklineVisualization.ftl | 15 +++++++++++++-- .../personlevel/coAuthorPersonLevel.ftl | 11 +++++++++-- .../visualization/personlevel/coPIPersonLevel.ftl | 11 +++++++++-- 4 files changed, 33 insertions(+), 12 deletions(-) diff --git a/productMods/css/visualization/visualization.css b/productMods/css/visualization/visualization.css index e78749ca..eb4148b0 100644 --- a/productMods/css/visualization/visualization.css +++ b/productMods/css/visualization/visualization.css @@ -47,13 +47,9 @@ span.incomplete-data-holder, text-decoration: underline; } -#coauthorship_link_container { - display: none; -} - -#coauthorship_link_container, -#coinvestigator_link_container { +.collaboratorship-link-container { margin-top: 20px; + display: none; } .sparkline_text { diff --git a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl index bcba8680..829b7c02 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl @@ -13,7 +13,7 @@
 
- -
+ + <#include "individual-visualization.ftl"> + -
-
- <#-- Image --> - <@p.imageLinks individual propertyGroups editable /> -
- -
-
- <#if relatedSubject??> -

${relatedSubject.relatingPredicateDomainPublic} for ${relatedSubject.name}

-

← return to ${relatedSubject.name}

- <#else> -

- <#-- Label --> - <#assign label = individual.nameStatement> - ${label.value} - <@p.editingLinks label label editable /> - - <#-- Moniker --> - <#if individual.moniker?has_content> - ${individual.moniker} - -

- -
- - <#-- Overview --> - <#include "individual-overview.ftl"> - - - - <#-- Links --> - <@p.vitroLinks propertyGroups editable /> -
-
- - <#-- RY Will we have an individual--foaf-organization.ftl template? If so, move this there and remove from here. - Also remove the method IndividualTemplateModel.isOrganization(). --> - <#if individual.organization > - <#-- Logically we only need section#temporal-graph, but css may depend on the outer sections. Leaving here for UI - team to check. --> -
-
-
-

Temporal Graph

-
-
-
- - -<#assign nameForOtherGroup = "other"> <#-- used by both individual-propertyGroupMenu.ftl and individual-properties.ftl --> - -<#-- Property group menu --> -<#include "individual-propertyGroupMenu.ftl"> - -<#-- Ontology properties --> -<#include "individual-properties.ftl"> - - -${stylesheets.add("/css/individual/individual.css")} - -<#-- RY Figure out which of these scripts really need to go into the head, and which are needed at all (e.g., tinyMCE??) --> -${headScripts.add("/js/jquery_plugins/getURLParam.js", - "/js/jquery_plugins/colorAnimations.js", - "/js/jquery_plugins/jquery.form.js", - "/js/tiny_mce/tiny_mce.js", - "/js/controls.js", - "/js/toggle.js")} - -${scripts.add("/js/imageUpload/imageUploadUtils.js")} \ No newline at end of file +<#include "individual-vitro.ftl"> \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualization.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualization.ftl new file mode 100644 index 00000000..85284ce6 --- /dev/null +++ b/productMods/templates/freemarker/body/partials/individual/individual-visualization.ftl @@ -0,0 +1,15 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Individual visualization template --> + + <#if individual.organization > + <#-- Logically we only need section#temporal-graph, but css may depend on the outer sections. Leaving here for UI + team to check. --> +
+
+
+

Temporal Graph

+
+
+
+ \ No newline at end of file From 2c7d396b59c3e069a2b8d8eb960d9fd730375cfd Mon Sep 17 00:00:00 2001 From: mb863 Date: Fri, 21 Jan 2011 03:24:14 +0000 Subject: [PATCH 083/427] NIHVIVO-1316: Added Research Areas label, remove pictos fonts, added uri link, added new admin panel, and changed markup for visualitation. --- .../individual/individual--foaf-person.ftl | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index be8d4ca7..25185cd7 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -3,10 +3,6 @@ <#-- Individual profile page template for foaf:Person individuals --> <#include "individual-setup.ftl"> - -<#if individual.showAdminPanel> - <#include "individual-adminPanel.ftl"> -
@@ -17,12 +13,14 @@ @@ -64,6 +62,10 @@
+ <#if individual.showAdminPanel> + <#include "individual-adminPanel.ftl"> + +
<#if relatedSubject??>

${relatedSubject.relatingPredicateDomainPublic} for ${relatedSubject.name}

@@ -73,7 +75,7 @@ <#-- Label --> <#assign label = individual.nameStatement> ${label.value} - <@p.editingLinks label label editable /> + <#-- <@p.editingLinks label label editable /> --> <#-- Moniker --> <#if individual.moniker?has_content> @@ -100,8 +102,9 @@ <#-- Research Areas --> <#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!> <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> - <#--

Research Areas <@p.addLink researchAreas editing />

--> - <@p.addLinkWithLabel researchAreas editable /> +

Research Areas <@p.addLink researchAreas editable />

+ + <#--<@p.addLinkWithLabel researchAreas editable />--> <#if researchAreas.statements?has_content> <#-- if there are any statements -->
    <@p.simpleObjectPropertyList researchAreas editable/> @@ -112,7 +115,7 @@
-
+
<#include "individual-sparklineVisualization.ftl">
From 04d6764eb35c5bbf9f80404929f41999d69f837c Mon Sep 17 00:00:00 2001 From: hlm7 Date: Fri, 21 Jan 2011 14:25:40 +0000 Subject: [PATCH 084/427] Holly made change last night and can't remember the detail...sorry --- .../suites/CreateProperties/DeleteMuseum.html | 50 +++++++++++++++++++ .../CreatePropertiesVB/DeleteMuseum.html | 50 +++++++++++++++++++ .../suites/ProcessRDFData/ExportRDFFile.html | 22 +++----- .../ProcessRDFDataVB/ExportRDFFile.html | 22 +++----- 4 files changed, 112 insertions(+), 32 deletions(-) diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html b/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html index be707598..2aea4ad3 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html @@ -199,6 +199,56 @@ 50000 + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + comment Verify Museum link is gone diff --git a/utilities/acceptance-tests/suites/CreatePropertiesVB/DeleteMuseum.html b/utilities/acceptance-tests/suites/CreatePropertiesVB/DeleteMuseum.html index be707598..2aea4ad3 100644 --- a/utilities/acceptance-tests/suites/CreatePropertiesVB/DeleteMuseum.html +++ b/utilities/acceptance-tests/suites/CreatePropertiesVB/DeleteMuseum.html @@ -199,6 +199,56 @@ 50000 + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + comment Verify Museum link is gone diff --git a/utilities/acceptance-tests/suites/ProcessRDFData/ExportRDFFile.html b/utilities/acceptance-tests/suites/ProcessRDFData/ExportRDFFile.html index b9e28136..c8209482 100644 --- a/utilities/acceptance-tests/suites/ProcessRDFData/ExportRDFFile.html +++ b/utilities/acceptance-tests/suites/ProcessRDFData/ExportRDFFile.html @@ -131,22 +131,7 @@ clickAndWait - //input[@name='submit' and @value='Export'] - - - - assertTitle - - - - - comment - Verify RDF data was creted - - - - assertElementPresent - //*[name() = 'rdf:RDF'] + submit @@ -184,6 +169,11 @@ VIVO + + clickAndWait + link=Log out + + diff --git a/utilities/acceptance-tests/suites/ProcessRDFDataVB/ExportRDFFile.html b/utilities/acceptance-tests/suites/ProcessRDFDataVB/ExportRDFFile.html index b9e28136..b84ca911 100644 --- a/utilities/acceptance-tests/suites/ProcessRDFDataVB/ExportRDFFile.html +++ b/utilities/acceptance-tests/suites/ProcessRDFDataVB/ExportRDFFile.html @@ -39,6 +39,11 @@ + + setTimeout + 200000 + + open /vivo/ @@ -131,22 +136,7 @@ clickAndWait - //input[@name='submit' and @value='Export'] - - - - assertTitle - - - - - comment - Verify RDF data was creted - - - - assertElementPresent - //*[name() = 'rdf:RDF'] + submit From 53ad28c7704f89f35b0fbf419d469193633f1b03 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Fri, 21 Jan 2011 17:39:03 +0000 Subject: [PATCH 085/427] Changes to individual templates and associated queries --- .../individual/individual--foaf-person.ftl | 26 +++++++------------ .../freemarker/body/individual/individual.ftl | 1 + 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index 25185cd7..c0cd4ac0 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -7,17 +7,13 @@
- <#-- Image --> - <@p.imageLinks individual propertyGroups editable "${urls.images}/placeholders/person.thumbnail.jpg" /> - + <@p.imageLinks individual propertyGroups namespaces editable "${urls.images}/placeholders/person.thumbnail.jpg" /> +
- +
<#if individual.showAdminPanel> <#include "individual-adminPanel.ftl"> @@ -73,9 +69,7 @@ <#else>

<#-- Label --> - <#assign label = individual.nameStatement> - ${label.value} - <#-- <@p.editingLinks label label editable /> --> + <@p.label individual editable /> <#-- Moniker --> <#if individual.moniker?has_content> @@ -87,7 +81,7 @@ <#-- Positions --> <#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!> <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> -

Positions <@p.addLink positions editable />

+

${positions.name?capitalize} <@p.addLink positions editable />

<#if positions.statements?has_content> <#-- if there are any statements -->
    <@p.objectPropertyList positions positions.statements positions.template editable /> @@ -102,9 +96,7 @@ <#-- Research Areas --> <#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!> <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> -

    Research Areas <@p.addLink researchAreas editable />

    - - <#--<@p.addLinkWithLabel researchAreas editable />--> +

    ${researchAreas.name?capitalize} <@p.addLink researchAreas editable />

    <#if researchAreas.statements?has_content> <#-- if there are any statements -->
      <@p.simpleObjectPropertyList researchAreas editable/> diff --git a/productMods/templates/freemarker/body/individual/individual.ftl b/productMods/templates/freemarker/body/individual/individual.ftl index 9ac67718..46dab407 100644 --- a/productMods/templates/freemarker/body/individual/individual.ftl +++ b/productMods/templates/freemarker/body/individual/individual.ftl @@ -1,6 +1,7 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- Default VIVO individual profile page template (extends individual.ftl in vitro) --> + <#include "individual-setup.ftl"> <#assign individualProductExtension> From dc36eb1a369c3e4e0c2aa3bc15b89ae732be86e9 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Fri, 21 Jan 2011 17:57:56 +0000 Subject: [PATCH 086/427] NIHVIVO-1839 Modify parameters on editingLinks macro so can pass in hard-coded value for rdfs:label --- .../freemarker/body/individual/individual--foaf-person.ftl | 4 ++-- .../body/partials/individual/individual-overview.ftl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index c0cd4ac0..5f287a82 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -30,7 +30,7 @@ <#list email.statements as statement>
    • email icon - <@p.editingLinks email statement editable /> + <@p.editingLinks "${email.localName}" statement editable />
    @@ -46,7 +46,7 @@ <#list phone.statements as statement>
  • phone icon${statement.value} - <@p.editingLinks phone statement editable /> + <@p.editingLinks "${phone.localName}" statement editable />
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl b/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl index 5ac61c3f..3db9b1f1 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl @@ -8,7 +8,7 @@ <#list overview.statements as statement>

${statement.value} - <@p.editingLinks overview statement editable /> + <@p.editingLinks "${overview.localName}" statement editable />

\ No newline at end of file From 0134b091a0ebd4c95328bc864e625ac732bf30e5 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Fri, 21 Jan 2011 18:33:15 +0000 Subject: [PATCH 087/427] Holly made various changes due to display name, error message, etc. modifications. --- .../CreatePeople/ChangeFacultyImage.html | 2 +- .../CreatePeople/CreateFacultyMember.html | 2 +- .../suites/CreatePeople/CreateLibrarian.html | 2 +- .../CreatePeople/DeleteFacultyImage.html | 2 +- .../CreatePeople/DeleteFacultyInfo.html | 94 +++++++++---------- .../CreatePeople/DeleteLibrarianImage.html | 2 +- .../suites/CreatePeople/DeleteTestPeople.html | 4 +- .../CreatePeople/UploadFacultyImage.html | 4 +- .../CreatePeople/VerifyImageDisplay.html | 45 --------- 9 files changed, 51 insertions(+), 106 deletions(-) diff --git a/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html index fef145d8..49e471c0 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/ChangeFacultyImage.html @@ -141,7 +141,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html b/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html index 0a450e05..79a7ca06 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html +++ b/utilities/acceptance-tests/suites/CreatePeople/CreateFacultyMember.html @@ -241,7 +241,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html b/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html index e61eb111..81a26787 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html +++ b/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html @@ -156,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html index 793b1e35..c2a40b4f 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html @@ -146,7 +146,7 @@ assertConfirmation - Are you sure you want to delete your photo? + Are you sure you want to delete this photo? diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html index 020d2eea..a99584fb 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html @@ -159,33 +159,8 @@ Faculty, Jane - - click - //img[@alt='delete'] - - - - assertConfirmation - Are you sure you want to delete your photo? - - - - assertTitle - Edit - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - click //img[@alt='delete'] @@ -205,15 +180,10 @@ - click + clickAndWait //img[@alt='delete'] - - assertConfirmation - Are you sure you want to delete your photo? - - assertTitle Edit @@ -230,15 +200,10 @@ - click + clickAndWait //img[@alt='delete'] - - assertConfirmation - Are you sure you want to delete your photo? - - assertTitle Edit @@ -255,15 +220,10 @@ - click + clickAndWait //img[@alt='delete'] - - assertConfirmation - Are you sure you want to delete your photo? - - assertTitle Edit @@ -280,15 +240,10 @@ - click + clickAndWait //img[@alt='delete'] - - assertConfirmation - Are you sure you want to delete your photo? - - assertTitle Edit @@ -305,13 +260,28 @@ - click + clickAndWait //img[@alt='delete'] - assertConfirmation - Are you sure you want to delete your photo? + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + //img[@alt='delete'] @@ -949,6 +919,26 @@ Faculty, Jane + + clickAndWait + //img[@alt='delete'] + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + comment Verify everything is gone diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html index 8272f04e..912509ed 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html @@ -131,7 +131,7 @@ assertConfirmation - Are you sure you want to delete your photo? + Are you sure you want to delete this photo? diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html index 94a0d273..1e5749d2 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html @@ -126,7 +126,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -196,7 +196,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html index 557a546c..a9ae666a 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/UploadFacultyImage.html @@ -151,7 +151,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -361,7 +361,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CreatePeople/VerifyImageDisplay.html b/utilities/acceptance-tests/suites/CreatePeople/VerifyImageDisplay.html index 63289a1c..0b8e9d7f 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/VerifyImageDisplay.html +++ b/utilities/acceptance-tests/suites/CreatePeople/VerifyImageDisplay.html @@ -89,51 +89,6 @@ //img[@title='no image'] - - comment - Navigate to a non-person - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Country - - - - assertTitle - Country - - - - clickAndWait - link=Afghanistan - - - - assertTitle - Afghanistan - - - - comment - Verify no image displays - - - - verifyElementNotPresent - //img[@title='no image'] - - comment Navigate to Jane Faculty From 5bfd82bff4b8ea4eac4f7ee5e1d204a86625885c Mon Sep 17 00:00:00 2001 From: nac26 Date: Fri, 21 Jan 2011 20:13:56 +0000 Subject: [PATCH 088/427] NIHVIVO-1820 Style tweaks due to introduction of dateTimeInterval dateTimeValue custom forms --- productMods/edit/forms/css/customForm.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/productMods/edit/forms/css/customForm.css b/productMods/edit/forms/css/customForm.css index 3a3a4047..2d4bd734 100644 --- a/productMods/edit/forms/css/customForm.css +++ b/productMods/edit/forms/css/customForm.css @@ -129,10 +129,10 @@ vertical-align:top; /********** dateTime **********/ -fieldset#dateTime { - margin-top: 0.5em; +fieldset.dateTime label { + display: inline; } -fieldset#dateTime label { - display: inline; +fieldset.dateTime select { + margin-top: 0; } \ No newline at end of file From f4759530133becd7f833b77b9b595bc135d0ebfa Mon Sep 17 00:00:00 2001 From: rjy7 Date: Fri, 21 Jan 2011 21:11:02 +0000 Subject: [PATCH 089/427] NIHVIVO-1863 Fix error in collated educational training query: reference was erroneously to core:Organization rather than foaf:Organization, which is why collation wasn't working. --- productMods/config/listViewConfig-educationalTraining.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/productMods/config/listViewConfig-educationalTraining.xml b/productMods/config/listViewConfig-educationalTraining.xml index 7e8fab4e..fb2f5c8d 100644 --- a/productMods/config/listViewConfig-educationalTraining.xml +++ b/productMods/config/listViewConfig-educationalTraining.xml @@ -43,6 +43,7 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> + PREFIX foaf: <http://xmlns.com/foaf/0.1/> SELECT DISTINCT ?subclass ?edTraining ?edTrainingName @@ -56,7 +57,7 @@ } OPTIONAL { GRAPH ?g2 { ?edTraining core:trainingAtOrganization ?org } GRAPH ?g3 { ?org rdfs:label ?orgName } - OPTIONAL { GRAPH ?g4 { ?subclass rdfs:subClassOf core:Organization } + OPTIONAL { GRAPH ?g4 { ?subclass rdfs:subClassOf foaf:Organization } GRAPH ?g5 { ?org a ?subclass } FILTER (?g5 != <http://vitro.mannlib.cornell.edu/default/inferred-tbox> && ?g5 != <http://vitro.mannlib.cornell.edu/default/vitro-kb-inf> ) From 04d5d32568b829fc294396ae69ac0bec6c38f6fb Mon Sep 17 00:00:00 2001 From: rjy7 Date: Fri, 21 Jan 2011 21:54:17 +0000 Subject: [PATCH 090/427] NIHVIVO-1863 Fix collated view of core:personInPosition and core:hasResearchArea --- .../individual/individual--foaf-person.ftl | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index 5f287a82..4f9f7f13 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -82,11 +82,9 @@ <#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!> <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->

${positions.name?capitalize} <@p.addLink positions editable />

- <#if positions.statements?has_content> <#-- if there are any statements --> -
    - <@p.objectPropertyList positions positions.statements positions.template editable /> -
- +
    + <@p.objectProperty positions editable /> +
@@ -96,12 +94,10 @@ <#-- Research Areas --> <#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!> <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> -

${researchAreas.name?capitalize} <@p.addLink researchAreas editable />

- <#if researchAreas.statements?has_content> <#-- if there are any statements --> -
    - <@p.simpleObjectPropertyList researchAreas editable/> -
- +

${researchAreas.name?capitalize} <@p.addLink researchAreas editable />

+
    + <@p.objectProperty researchAreas editable "propStatement-simple.ftl" /> +
@@ -120,12 +116,8 @@
    -
    • -
    • -
    • -
    • -
    • -
    • +
    • +

View All arrow icon

From 5ab3cbce42a509c980d50137e783e3fd9cd72eab Mon Sep 17 00:00:00 2001 From: hlm7 Date: Fri, 21 Jan 2011 21:56:54 +0000 Subject: [PATCH 091/427] Holly finalized (or close to it) the AddNonPersonThings test suite. --- .../AddNonPersonThings/CheckIndexView.html | 10 - .../AddNonPersonThings/CheckPublicView.html | 1044 ++++++++++++++++- .../AddNonPersonThings/CreateActivity.html | 36 +- .../AddNonPersonThings/CreateCourse.html | 43 +- .../AddNonPersonThings/CreateEvent.html | 36 +- .../CreateFacultyMember.html | 2 +- .../AddNonPersonThings/CreateLibrarian.html | 2 +- .../CreateOrganization.html | 22 +- .../AddNonPersonThings/DeleteIndexStuff.html | 125 +- .../VerifyAllThingsSearchable.html | 7 +- 10 files changed, 1111 insertions(+), 216 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html index 6feae912..405423e8 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html @@ -149,11 +149,6 @@ Course (1) - - verifyTextPresent - Academic Term (1) - - verifyTextPresent Conference (1) @@ -284,11 +279,6 @@ link=Course - - verifyElementPresent - link=Academic Term - - verifyElementPresent link=Conference diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html index 3b47e613..b3708ea1 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html @@ -94,11 +94,46 @@ Faculty, Jane + + verifyTextPresent + Positions + + verifyTextPresent Primate College of America, Dr. 1999 - + + verifyElementPresent + link=Primate College of America + + + + verifyTextPresent + Research Areas + + + + verifyElementPresent + link=Primate Health + + + + verifyTextPresent + Service + + + + verifyTextPresent + organizer of + + + + verifyElementPresent + link=Introduction to Primate Health + + verifyTextPresent Introduction to Primate Health Course @@ -144,11 +179,26 @@ Librarian, Lily + + verifyTextPresent + Service + + + + verifyTextPresent + organizer of + + verifyTextPresent Primate Health Conference Conference + + verifyElementPresent + link=Primate Health Conference + + comment Go back to Index @@ -189,6 +239,21 @@ Primate Heart Health Clinic + + verifyTextPresent + related role + + + + verifyTextPresent + clinical role + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America Founder 2010 - @@ -229,31 +294,81 @@ Introduction to Primate Health + + verifyTextPresent + offered by + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America College + + verifyTextPresent + description + + verifyTextPresent Learn the basics about the general health of primates. + + verifyTextPresent + organized by + + + + verifyElementPresent + link=Faculty, Jane + + verifyTextPresent Faculty, Jane Assistant Professor + + verifyTextPresent + prerequisite for + + + + verifyElementPresent + link=Introduction to Primate Health + + verifyTextPresent Introduction to Primate Health Course + + verifyTextPresent + contact information + + verifyTextPresent ME Tarzan at metarzan@primates.edu or 555-555-5553 + + verifyTextPresent + geographic focus + + + + verifyElementPresent + link=Africa + + verifyTextPresent Africa geographical_region @@ -261,7 +376,37 @@ verifyTextPresent - Liberia + has geographic location + + + + verifyElementPresent + link=Liberia + + + + verifyTextPresent + Liberia self_governing + + + + verifyTextPresent + date/time interval + + + + verifyTextPresent + September 1, 2007 - December 15, 2007 + + + + verifyTextPresent + related documents + + + + verifyElementPresent + link=http://primatehealthintro.cornell.edu @@ -269,11 +414,41 @@ http://primatehealthintro.cornell.edu Webpage + + verifyTextPresent + has prerequisite + + + + verifyElementPresent + link=Introduction to Primate Health + + verifyTextPresent Introduction to Primate Health Course + + verifyTextPresent + subject area + + + + verifyElementPresent + link=Primate Health + + + + verifyTextPresent + Primate Health Subject Area + + + + verifyElementPresent + link=Animal Health + + verifyTextPresent Animal Health Subject Area @@ -281,7 +456,12 @@ verifyTextPresent - Primate Health Subject Area + includes event + + + + verifyElementPresent + link=Primate Health Check @@ -291,12 +471,12 @@ verifyTextPresent - 9 + credits verifyTextPresent - Fall Semester 2007 | Academic Term + 9 @@ -319,41 +499,6 @@ Verify Events - - clickAndWait - link=Academic Term - - - - assertTitle - Academic Term - - - - clickAndWait - link=Fall Semester 2007 - - - - assertTitle - Fall Semester 2007 - - - - verifyTextPresent - Introduction to Primate Health Course - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - clickAndWait link=Conference @@ -374,21 +519,51 @@ Primate Health Conference + + verifyTextPresent + description + + verifyTextPresent First annual conference for those interested in the general health of primates. + + verifyTextPresent + proceedings + + + + verifyElementPresent + link=PHC Proceedings + + verifyTextPresent PHC Proceedings Proceedings + + verifyTextPresent + organized by + + + + verifyElementPresent + link=Librarian, Lily + + verifyTextPresent Librarian, Lily Assistant Librarian + + verifyTextPresent + contact information + + verifyTextPresent info@primateconf.org @@ -396,17 +571,52 @@ verifyTextPresent - Kenya + geographic focus + + + + verifyElementPresent + link=Kenya verifyTextPresent - the Congo + Kenya self_governing verifyTextPresent - 2011-01-05 to 2011-01-09 + has geographic location + + + + verifyElementPresent + link=the Congo + + + + verifyTextPresent + the Congo self_governing + + + + verifyTextPresent + date/time interval + + + + verifyTextPresent + January 5, 2011 - January 9, 2011 + + + + verifyTextPresent + related documents + + + + verifyElementPresent + link=http://primatehealthintro.cornell.edu @@ -414,16 +624,41 @@ http://primatehealthintro.cornell.edu Webpage + + verifyTextPresent + subject area + + + + verifyElementPresent + link=Animal Health + + verifyTextPresent Animal Health Subject Area + + verifyTextPresent + includes event + + + + verifyElementPresent + link=Primate Health Check + + verifyTextPresent Primate Health Check Event + + verifyTextPresent + abbreviation + + verifyTextPresent PrimHConf @@ -459,6 +694,21 @@ Primate Health and Fitness + + verifyTextPresent + related role + + + + verifyTextPresent + presenter role + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America Organizer 2008 @@ -546,7 +796,12 @@ verifyTextPresent - Primate College of America College + predecessor organization + + + + verifyElementPresent + link=Primate College of America @@ -554,6 +809,31 @@ Primate College of America College + + verifyTextPresent + successor organization + + + + verifyElementPresent + link=Primate College of America + + + + verifyTextPresent + Primate College of America College + + + + verifyTextPresent + offers degree + + + + verifyElementPresent + link=B.S. Bachelor of Science + + verifyTextPresent B.S. Bachelor of Science Academic Degree @@ -561,7 +841,12 @@ verifyTextPresent - Primate Habitat Research Grant Grant + awards grant + + + + verifyElementPresent + link=Primate Habitat Research Grant @@ -569,61 +854,181 @@ Primate Habitat Research Grant Grant + + verifyTextPresent + subcontracts grant + + + + verifyElementPresent + link=Primate Survival Planning Grant + + verifyTextPresent Primate Survival Planning Grant Grant + + verifyTextPresent + sponsors award or honor + + + + verifyElementPresent + link=Primate Student of the Year + + verifyTextPresent Primate Student of the Year Award or Honor + + verifyTextPresent + award or honor given + + + + verifyElementPresent + link=Best Primate College + + verifyTextPresent Best Primate College Award or Honor Receipt + + verifyTextPresent + has equipment + + + + verifyElementPresent + link=Portable Primate Habitat + + verifyTextPresent Portable Primate Habitat Equipment + + verifyTextPresent + has sub-organization + + + + verifyElementPresent + link=Primate Research Laboratory + + verifyTextPresent Primate Research Laboratory Laboratory + + verifyTextPresent + organization within + + + + verifyElementPresent + link=Primate History Library + + verifyTextPresent Primate History Library Library + + verifyTextPresent + people + + + + verifyElementPresent + link=Faculty, Jane + + verifyTextPresent Faculty, Jane, Dr. 1999 - + + verifyTextPresent + head of + + + + verifyElementPresent + link=Primates-r-us + + verifyTextPresent Primates-r-us Founder 2010 - + + verifyTextPresent + affliliated organization + + + + verifyElementPresent + link=Primates-r-us + + verifyTextPresent Primates-r-us Organization + + verifyTextPresent + member of + + + + verifyElementPresent + link=Primate Colleges of the World + + verifyTextPresent Primate Colleges of the World Member 2009 - + + verifyTextPresent + collaborator + + + + verifyElementPresent + link=Primate History Library + + verifyTextPresent Primate History Library Library + + verifyTextPresent + clinical activities + + + + verifyElementPresent + link=Primate Heart Health Clinic + + verifyTextPresent Primate Heart Health Clinic Founder 2010 - @@ -631,7 +1036,27 @@ verifyTextPresent - Primate Info + selected publications + + + + verifyTextPresent + database + + + + verifyElementPresent + link=Primate Info + + + + verifyTextPresent + presentations + + + + verifyElementPresent + link=Primate Health and Fitness @@ -639,46 +1064,121 @@ Primate Health and Fitness Organizer 2008 + + verifyTextPresent + outreach and community service + + + + verifyElementPresent + link=Primate Health Check + + verifyTextPresent Primate Health Check Sponsor 2008 - 2010 + + verifyTextPresent + has geographic location + + + + verifyElementPresent + link=northern Africa + + verifyTextPresent northern Africa geographical_region + + verifyTextPresent + email + + verifyTextPresent info@primates.edu + + verifyTextPresent + phone + + verifyTextPresent 555-555-5555 + + verifyTextPresent + fax + + verifyTextPresent 555-555-5554 + + verifyTextPresent + mailing address + + + + verifyElementPresent + link=1234 Northern African Nation + + verifyTextPresent 1234 Northern African Nation Address + + verifyTextPresent + date/time interval + + + + verifyTextPresent + 1959 - + + + + verifyTextPresent + offers course + + + + verifyElementPresent + link=Introduction to Primate Health + + verifyTextPresent Introduction to Primate Health Course + + verifyTextPresent + abbreviation + + verifyTextPresent PCoA + + verifyTextPresent + keywords + + verifyTextPresent Gorillas @@ -714,16 +1214,51 @@ Primate Colleges of the World + + verifyTextPresent + administers grant + + + + verifyElementPresent + link=Primate Elderly Care + + verifyTextPresent Primate Elderly Care Grant + + verifyTextPresent + related role + + + + verifyTextPresent + member role + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America Member 2009 - + + verifyTextPresent + subcontracts grant + + + + verifyElementPresent + link=Primate Elderly Care + + verifyTextPresent Primate Elderly Care Grant @@ -759,6 +1294,21 @@ Primate History Library + + verifyTextPresent + Affiliation + + + + verifyTextPresent + has sub-organization + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America College @@ -794,21 +1344,61 @@ Primate Research Laboratory + + verifyTextPresent + awards grant + + + + verifyElementPresent + link=Primate Elderly Care + + verifyTextPresent Primate Elderly Care Grant + + verifyTextPresent + has equipment + + + + verifyElementPresent + link=Primate Feeder + + verifyTextPresent Primate Feeder Equipment + + verifyTextPresent + has facility + + + + verifyElementPresent + link=Jane Memorial Building + + verifyTextPresent Jane Memorial Building Building + + verifyTextPresent + organization within + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America College @@ -844,6 +1434,21 @@ Primates-r-us + + verifyTextPresent + related role + + + + verifyTextPresent + leader role + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America Founder 2010 - @@ -889,11 +1494,31 @@ Portable Primate Habitat + + verifyTextPresent + equipment for + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America College + + verifyTextPresent + in facility + + + + verifyElementPresent + link=Jane Memorial Building + + verifyTextPresent Jane Memorial Building Building @@ -929,21 +1554,56 @@ Primate Feeder + + verifyTextPresent + equipment for + + + + verifyElementPresent + link=Primate Research Laboratory + + verifyTextPresent Primate Research Laboratory Laboratory + + verifyTextPresent + in facility + + + + verifyElementPresent + link=Primate Research Lab Room 123 + + verifyTextPresent Primate Research Lab Room 123 Facility + + verifyTextPresent + subject area + + + + verifyElementPresent + link=Primate Diet + + verifyTextPresent Primate Diet Subject Area + + verifyTextPresent + keywords + + verifyTextPresent Animal Diet @@ -989,56 +1649,151 @@ Primate Elderly Care + + verifyTextPresent + administered by + + + + verifyElementPresent + link=Primate Colleges of the World + + verifyTextPresent Primate Colleges of the World Consortium + + verifyTextPresent + grant awarded by + + + + verifyElementPresent + link=Primate Research Laboratory + + verifyTextPresent Primate Research Laboratory Laboratory + + verifyTextPresent + abstract + + verifyTextPresent Purpose of grant is to determine the appropriate environment, physical activity, and diet for primates as they age. + + verifyTextPresent + subcontracted through + + + + verifyElementPresent + link=Primate Colleges of the World + + verifyTextPresent Primate Colleges of the World Consortium + + verifyTextPresent + total award amount + + verifyTextPresent $1,234,567 + + verifyTextPresent + direct costs + + verifyTextPresent $999,999 + + verifyTextPresent + sponsor award id + + verifyTextPresent 1234-5678 + + verifyTextPresent + geographic focus + + + + verifyElementPresent + link=Africa + + verifyTextPresent Africa geographical_region + + verifyTextPresent + date/time interval + + + + verifyTextPresent + September 1, 2010 - August 31, 2012 + + + + verifyTextPresent + local award id + + verifyTextPresent P999-1234 + + verifyTextPresent + funding vehicle for + + + + verifyElementPresent + link=Primate Student of the Year + + verifyTextPresent Primate Student of the Year Award or Honor + + verifyTextPresent + subject area + + + + verifyElementPresent + link=Elderly Care + + verifyTextPresent Elderly Care Subject Area @@ -1074,6 +1829,16 @@ Primate Habitat Research Grant + + verifyTextPresent + grant awarded by + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America College @@ -1109,6 +1874,16 @@ Primate Survival Planning Grant + + verifyTextPresent + subcontracted through + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America College @@ -1144,11 +1919,31 @@ Elderly Care + + verifyTextPresent + subject area for + + + + verifyElementPresent + link=Primate Elderly Care + + verifyTextPresent Primate Elderly Care Grant + + verifyTextPresent + related + + + + verifyElementPresent + link=Primate Health + + verifyTextPresent Primate Health Subject Area @@ -1184,11 +1979,31 @@ Primate Diet + + verifyTextPresent + broader term + + + + verifyElementPresent + link=Primate Health + + verifyTextPresent Primate Health Subject Area + + verifyTextPresent + subject area for + + + + verifyElementPresent + link=Primate Feeder + + verifyTextPresent Primate Feeder Equipment @@ -1224,31 +2039,91 @@ Primate Health + + verifyTextPresent + broader term + + + + verifyElementPresent + link=Animal Health + + verifyTextPresent Animal Health Subject Area + + verifyTextPresent + research area of + + + + verifyElementPresent + link=Faculty, Jane + + verifyTextPresent Faculty, Jane Assistant Professor + + verifyTextPresent + source vocabulary reference + + + + verifyElementPresent + link=Not sure + + verifyTextPresent Not sure Vocabulary Source Reference + + verifyTextPresent + subject area for + + + + verifyElementPresent + link=Introduction to Primate Health + + verifyTextPresent Introduction to Primate Health Course + + verifyTextPresent + narrower term + + + + verifyElementPresent + link=Primate Diet + + verifyTextPresent Primate Diet Subject Area + + verifyTextPresent + related to + + + + verifyElementPresent + link=Elderly Care + + verifyTextPresent Elderly Care Subject Area @@ -1276,12 +2151,22 @@ clickAndWait - link=exact:http://primatehealthintro.cornell.edu + link=http://primatehealthintro.cornell.edu assertTitle - exact:http://primatehealthintro.cornell.edu + http://primatehealthintro.cornell.edu + + + + verifyTextPresent + presented at + + + + verifyElementPresent + link=Primate Health Conference @@ -1289,6 +2174,11 @@ Primate Health Conference Conference + + verifyElementPresent + link=Introduction to Primate Health + + verifyTextPresent Introduction to Primate Health Course @@ -1334,26 +2224,76 @@ Jane Memorial Building + + verifyTextPresent + facility for + + + + verifyElementPresent + link=Primate Research Laboratory + + verifyTextPresent Primate Research Laboratory Laboratory + + verifyTextPresent + rooms + + + + verifyElementPresent + link=Lab Admin Office + + verifyTextPresent Lab Admin Office Room + + verifyTextPresent + geographically contains + + + + verifyElementPresent + link=Primate Research Laboratory + + verifyTextPresent Primate Research Laboratory Campus + + verifyTextPresent + location of equipment + + + + verifyElementPresent + link=Portable Primate Habitat + + verifyTextPresent Portable Primate Habitat Equipment + + verifyTextPresent + geographic location of + + + + verifyElementPresent + link=Primate Research Lab Room 123 + + verifyTextPresent Primate Research Lab Room 123 Facility @@ -1389,6 +2329,16 @@ Lab Admin Office + + verifyTextPresent + room within building + + + + verifyElementPresent + link=Jane Memorial Building + + verifyTextPresent Jane Memorial Building Building diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html index 101c7675..f7a9a0d7 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html @@ -444,25 +444,35 @@ Edit + + type + startField.year + 2010 + select - typeOfNew - label=Date/Time Interval (core) + startField.month + label=9 - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - + select + startField.day + label=1 type - name - 2010-09-01 to 2012-08-31 + endField.year + 2012 + + + select + endField.month + label=8 + + + select + endField.day + label=31 clickAndWait @@ -631,7 +641,7 @@ verifyTextPresent - 2010-09-01 to 2012-08-31 + September 1, 2010 - August 31, 2012 diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html index 6f55b8cb..a04f4093 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html @@ -416,23 +416,38 @@ verifyTextPresent - Select an existing Date/Time Interval for Introduction to Primate Health - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit + Create date time interval for Introduction to Primate Health type - name - Fall Semester 2007 + startField.year + 2007 + + + select + startField.month + label=9 + + + select + startField.day + label=1 + + + type + endField.year + 2007 + + + select + endField.month + label=12 + + + select + endField.day + label=15 clickAndWait @@ -636,7 +651,7 @@ verifyTextPresent - Fall Semester 2007 + September 1, 2007 - December 15, 2007 diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html index 77630766..5dd4fe75 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html @@ -434,25 +434,35 @@ Edit + + type + startField.year + 2011 + select - typeOfNew - label=Date/Time Interval (core) + startField.month + label=1 - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - + select + startField.day + label=5 type - name - 2011-01-05 to 2011-01-09 + endField.year + 2011 + + + select + endField.month + label=1 + + + select + endField.day + label=9 clickAndWait @@ -616,7 +626,7 @@ verifyTextPresent - 2011-01-05 to 2011-01-09 + January 5, 2011 - January 9, 2011 diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html index 6b4207c4..125482c5 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html @@ -146,7 +146,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html index 8b62cf7a..43d5e847 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html @@ -151,7 +151,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html index cdc892b2..a3c9b5e1 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html @@ -466,7 +466,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img + //h3[@id='hasSubOrganization']/a/img @@ -1039,21 +1039,6 @@ Edit - - select - typeOfNew - label=Date/Time Interval (core) - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type startField.year @@ -1069,6 +1054,11 @@ Primate College of America + + assertTitle + Primate College of America + + comment Test other entry diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html index ac0c6a39..f10c38e3 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html @@ -149,6 +149,11 @@ equipment + + verifyTextPresent + Academic Term (1) + + verifyTextPresent research @@ -186,7 +191,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -256,7 +261,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -331,7 +336,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -401,7 +406,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -471,7 +476,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -541,7 +546,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -616,7 +621,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -669,76 +674,6 @@ Delete Events - - clickAndWait - link=Academic Term - - - - assertTitle - Academic Term - - - - clickAndWait - link=Fall Semester 2007 - - - - assertTitle - Fall Semester 2007 - - - - clickAndWait - link=edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - click - _delete - - - - assertConfirmation - Are you SURE you want to delete this entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - clickAndWait link=Conference @@ -761,7 +696,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -831,7 +766,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -906,7 +841,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -976,7 +911,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1046,7 +981,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1116,7 +1051,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1181,7 +1116,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1256,7 +1191,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1326,7 +1261,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1401,7 +1336,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1466,7 +1401,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1531,7 +1466,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1601,7 +1536,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1671,7 +1606,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1741,7 +1676,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1811,7 +1746,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1886,7 +1821,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1956,7 +1891,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html index cf5a22cf..78d8f556 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html @@ -141,7 +141,7 @@ verifyTextPresent - Primate Info | Database + Primate Info | Database @@ -279,11 +279,6 @@ 1234 Northern African Nation | Address - - verifyTextPresent - Fall Semester 2007 | Academic Term - - verifyTextPresent Librarian, Lily | Assistant Librarian From c920c846990d197b58d4c193b8e788c21f23dafc Mon Sep 17 00:00:00 2001 From: cdtank Date: Sat, 22 Jan 2011 01:14:42 +0000 Subject: [PATCH 092/427] 1. Refactored some visualziation helper functions spread across different files into one javascript file. 2. Fixed the bug NIHVIVO-1595. Now for https: sites the sparkline visualizations are rendered by generating a chart image url instead of going throught the google visualization API. This image is directly placed in the container. For http sites it follows the old procedure. --- .../css/visualization/visualization.css | 7 +- .../visualization/personlevel/person-level.js | 11 --- .../visualization-helper-functions.js | 95 +++++++++++++++++++ .../individual-sparklineVisualization.ftl | 3 + .../coAuthorshipSparklineContent.ftl | 69 ++++++++++++-- .../coAuthorshipStandaloneActivator.ftl | 2 + .../copi/coInvestigationSparklineContent.ftl | 69 ++++++++++++-- .../coInvestigationStandaloneActivator.ftl | 2 + .../personGrantCountStandaloneActivator.ftl | 2 + .../grant/personGrantSparklineContent.ftl | 59 +++++++++++- .../personlevel/coAuthorPersonLevel.ftl | 3 + .../personlevel/coPIPersonLevel.ftl | 3 + ...sonPublicationCountStandaloneActivator.ftl | 2 + .../personPublicationSparklineContent.ftl | 70 ++++++++++++-- 14 files changed, 352 insertions(+), 45 deletions(-) create mode 100644 productMods/js/visualization/visualization-helper-functions.js diff --git a/productMods/css/visualization/visualization.css b/productMods/css/visualization/visualization.css index eb4148b0..26d479ec 100644 --- a/productMods/css/visualization/visualization.css +++ b/productMods/css/visualization/visualization.css @@ -65,11 +65,16 @@ span.incomplete-data-holder, } .google-visualization-sparkline-image { - border: 1px solid #cfe4ed; + border: 1px solid #cfe4ed; + display: block; } .google-visualization-sparkline-selected { background-color: blue; + border-spacing: 0; + color: gray; + font-size: small; + padding: 1px; } .visualization-menupage-link { diff --git a/productMods/js/visualization/personlevel/person-level.js b/productMods/js/visualization/personlevel/person-level.js index 62f4bd97..ec625d33 100644 --- a/productMods/js/visualization/personlevel/person-level.js +++ b/productMods/js/visualization/personlevel/person-level.js @@ -82,17 +82,6 @@ function getWellFormedURLs(given_uri, type) { } } -$.fn.image = function(src, successFunc, failureFunc){ - return this.each(function(){ - var profileImage = new Image(); - profileImage.onerror = failureFunc; - profileImage.onload = successFunc; - profileImage.src = src; - - return profileImage; - }); -}; - function setProfileImage(imageContainerID, mainImageURL) { if (imageContainerID == "") { diff --git a/productMods/js/visualization/visualization-helper-functions.js b/productMods/js/visualization/visualization-helper-functions.js new file mode 100644 index 00000000..15081334 --- /dev/null +++ b/productMods/js/visualization/visualization-helper-functions.js @@ -0,0 +1,95 @@ +/** + * For rendering images dynamically. + * + */ +$.fn.image = function(src, successFunc, failureFunc){ + return this.each(function(){ + var profileImage = new Image(); + profileImage.onerror = failureFunc; + profileImage.onload = successFunc; + profileImage.src = src; + + return profileImage; + }); +}; + + +/** + * Function by Google Charts API Team to do "extended encode" of data. +*/ +function extendedEncodeDataForChartURL(arrVals, maxVal) { + + var EXTENDED_MAP = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-.'; + var EXTENDED_MAP_LENGTH = EXTENDED_MAP.length; + var chartData = 'e:'; + + for (i = 0, len = arrVals.length; i < len; i++) { + // In case the array vals were translated to strings. + var numericVal = new Number(arrVals[i]); + // Scale the value to maxVal. + var scaledVal = Math.floor(EXTENDED_MAP_LENGTH * EXTENDED_MAP_LENGTH * numericVal / maxVal); + + if (scaledVal > (EXTENDED_MAP_LENGTH * EXTENDED_MAP_LENGTH) - 1) { + chartData += ".."; + } else if (scaledVal < 0) { + chartData += '__'; + } else { + // Calculate first and second digits and add them to the output. + var quotient = Math.floor(scaledVal / EXTENDED_MAP_LENGTH); + var remainder = scaledVal - EXTENDED_MAP_LENGTH * quotient; + chartData += EXTENDED_MAP.charAt(quotient) + EXTENDED_MAP.charAt(remainder); + } + } + + return chartData; +} + +/** + * This will be used for getting images directly from the secure https://charts.googleapis.com + * instead of http://charts.apis.google.com which currently throws security warnings. + * + * see http://code.google.com/apis/chart/docs/chart_params.html FOR chart parameters + * see http://code.google.com/apis/chart/docs/data_formats.html FOR how to encode data + * + * sample constructed URL - https://chart.googleapis.com/chart?cht=ls&chs=148x58&chdlp=r&chco=3399CC&chd=e%3AW2ttpJbb..ttgAbbNtAA + */ +function constructVisualizationURLForSparkline(dataString, visualizationOptions) { + + /* + * Since we are directly going to use this URL in img tag, we are supposed to enocde "&" + * update: But since we are directly using it in an Image creating function we dont need to encode it. + */ + //var parameterDifferentiator = "&"; + var parameterDifferentiator = "&"; + + var rootGoogleChartAPI_URL = "https://chart.googleapis.com/chart?"; + + /* + * cht=ls indicates chart of type "line chart sparklines". + * see http://code.google.com/apis/chart/docs/gallery/chart_gall.html + */ + var chartType = "cht=" + visualizationOptions.chartType; + + /* + * It seems google reduces 2px from width & height before rendering the actual image. + * We will do the same. + */ + var chartSize = "chs=" + (visualizationOptions.width - 2) + "x" + (visualizationOptions.height - 2); + + /* + * It means that legend, if present, is to be displayed to the right of the chart, + * legend entries in a vertical column. + */ + var chartLabelPosition = "chdlp=" + visualizationOptions.chartLabel; + + /* + * Color of the sparkline. + */ + var chartColor = "chco=" + visualizationOptions.color; + + return rootGoogleChartAPI_URL + chartType + parameterDifferentiator + + chartSize + parameterDifferentiator + + chartLabelPosition + parameterDifferentiator + + chartColor + parameterDifferentiator + + "chd=" + dataString +} \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl index 3c6be712..c62bf94d 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl @@ -10,6 +10,7 @@ <#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22imagesparkline%22%5D%7D%5D%7D'> <#assign coAuthorURL = '${urls.base}${standardVisualizationURLRoot}?vis=person_level&uri=${individual.uri}&vis_mode=coauthor'> <#assign coInvestigatorURL = '${urls.base}${standardVisualizationURLRoot}?vis=person_level&uri=${individual.uri}&vis_mode=copi'> +<#assign visualizationHelperJavaScript = 'js/visualization/visualization-helper-functions.js'>
 
@@ -33,7 +34,9 @@ ${stylesheets.add("css/visualization/visualization.css")} ${scripts.add(googleJSAPI)} + ${scripts.add(visualizationHelperJavaScript)} ${scripts.add("/js/visualization/sparkline.js")} + ${scripts.add(visualizationHelperJavaScript)} +${scripts.add(visualizationHelperJavaScript)} + <#assign pageStyle = "${urls.base}/css/visualization/personlevel/page.css" /> <#assign vizStyle = "${urls.base}/css/visualization/visualization.css" /> diff --git a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl b/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl index 7cc5ebee..33e031e4 100644 --- a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl +++ b/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl @@ -19,6 +19,7 @@ <#assign googleVisualizationAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> <#assign coInvestigatorPersonLevelJavaScript = '${urls.base}/js/visualization/coPIship/coPIship-person-level.js'> <#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'> +<#assign visualizationHelperJavaScript = 'js/visualization/visualization-helper-functions.js'> @@ -50,6 +51,8 @@ var visualizationDataRoot = "${dataVisualizationURLRoot}"; +${scripts.add(visualizationHelperJavaScript)} + <#assign pageStyle = "${urls.base}/css/visualization/personlevel/page.css" /> <#assign vizStyle = "${urls.base}/css/visualization/visualization.css" /> diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl index 8bb9745e..49a7c345 100644 --- a/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl @@ -1,7 +1,9 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> +<#assign visualizationHelperJavaScript = 'js/visualization/visualization-helper-functions.js'> ${headScripts.add(googleJSAPI)} +${scripts.add(visualizationHelperJavaScript)} <#include "personPublicationSparklineContent.ftl"> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl b/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl index 6e3208d4..629e9203 100644 --- a/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl +++ b/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl @@ -47,18 +47,68 @@ <#else> + + var visualizationOptions = { + width: 150, + height: 60, + color: '3399CC', + chartType: 'ls', + chartLabel: 'r' + } + + /* + Test if we want to go for the approach when serving visualizations from a secure site.. + If "https:" is not found in location.protocol then we do everything normally. + */ + if (location.protocol.indexOf("https") == -1) { + /* + This condition will make sure that the location protocol (http, https, etc) does not have + for word https in it. + */ + + <#-- Create the vis object and draw it in the div pertaining to sparkline. --> + var sparkline = new google.visualization.ImageSparkLine(providedSparklineImgTD[0]); + sparkline.draw(sparklineDataView, { + width: visualizationOptions.width, + height: visualizationOptions.height, + showAxisLines: false, + showValueLabels: false, + labelPosition: 'none' + }); + + } else { + + <#-- Prepare data for generating google chart URL. --> + + <#-- If we need to serve data for https:, we have to create an array of values to be plotted. --> + var chartValuesForEncoding = new Array(); + + $.each(sparklineDataView.getViewRows(), function(index, value) { + chartValuesForEncoding.push(data.getValue(value, 1)); + }); + + var chartImageURL = constructVisualizationURLForSparkline( + extendedEncodeDataForChartURL(chartValuesForEncoding, + sparklineDataView.getColumnRange(0).max), + visualizationOptions); + + var imageContainer = $(providedSparklineImgTD[0]); + + imageContainer.image(chartImageURL, + function(){ + imageContainer.empty().append(this); + $(this).addClass("google-visualization-sparkline-image"); + }, + function(){ + // For performing any action on failure to + // find the image. + imageContainer.empty(); + } + ); + + } - <#-- Create the vis object and draw it in the div pertaining to sparkline. --> - var sparkline = new google.visualization.ImageSparkLine(providedSparklineImgTD[0]); - sparkline.draw(sparklineDataView, { - width: 150, - height: 60, - showAxisLines: false, - showValueLabels: false, - labelPosition: 'none' - }); - <#if sparklineVO.shortVisMode> <#-- We want to display how many publication counts were considered, so this is used to calculate this. --> From 5e3df050914a3a0bb26f8ce865fa6f0d66dc7670 Mon Sep 17 00:00:00 2001 From: sjm222 Date: Sat, 22 Jan 2011 02:12:47 +0000 Subject: [PATCH 093/427] NIHVIVO-1872 (change label for core:hasPrerequisite from hasPrerequisite to has prerequisite --- .../WEB-INF/filegraph/tbox/scires-1.2.owl | 12 +- .../WEB-INF/filegraph/tbox/vivo-core-1.2.owl | 2552 ++++++++--------- .../user/vivo-core-1.2-annotations.rdf | 4 +- productMods/WEB-INF/submodels/scires-1.2.owl | 12 +- .../WEB-INF/submodels/vivo-core-1.2.owl | 2552 ++++++++--------- 5 files changed, 2566 insertions(+), 2566 deletions(-) diff --git a/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl b/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl index eae63da2..0b30406d 100644 --- a/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl +++ b/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl @@ -27,11 +27,11 @@ number of human participants in the study (trial). + An implement used to facilitate work, especially precision work. An implement used to facilitate work, especially precision work. - A plan specification that allows different domain experts to reliably and independently reproduce a process. @@ -140,11 +140,6 @@ NOTE: For now we are not addressing whether this is a subclass of foaf:AgentA clinical trial is a research study using human volunteers to answer questions about treatments for diseases and conditions. Clinical trials are conducted in phases. The trials at each phase have a different purpose and help scientists answer different questions. A research study using human volunteers to answer specifc health-related questions. - - - - - @@ -162,4 +157,9 @@ NOTE: For now we are not addressing whether this is a subclass of foaf:Agent + + + + + diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl index e1d1b7c2..bfd3101c 100644 --- a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl +++ b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl @@ -25,11 +25,6 @@ A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available in PubMed Central. The PMCID is issued shortly after the PI or author approves the PubMed Central formatted web version of the submission. - - - - - http://purl.org/ontology/bibo/ Short Definition from bibo ontology @@ -54,27 +49,12 @@ - - - - - - - - 1 - - - - - - - For individual seminars, use seminar instead. core:ConferenceSeries and core:SeminarSeries are very similar. @@ -82,23 +62,13 @@ An organized series of a meeting for an exchange of ideas, typically put on by a department or center. - - - - - - - + - - - - - 1 - + + @@ -123,12 +93,12 @@ - + UN Cartographic Section UN Cartographic Section - + - + @@ -136,34 +106,24 @@ - - - 1 - - - + Accounting & Research Services Assistant; Director of Information Technology Staff, support, and other non-academic positions. A position classified as professional, staff, support, or any other non-academic role - + - - - - - http://purl.org/ontology/bibo/ A sub property of identifier (http://en.wikipedia.org/wiki/SICI). @@ -172,15 +132,10 @@ Serial Item and Contribution Identifier - - - - - - - - + + 1 + @@ -220,11 +175,6 @@ - - - 1 - - FAO's geopolitical ontology version 1.1 was populated with FAO, UN and internationally recognized data sources. FAO DISCLAIMER: The designations employed and the presentation of material do not imply the expression of any opinion whatsoever on the part of the Food and Agriculture Organization of the United Nations concerning the legal status of any country, territory, city or area, or of its authorities, or concerning the delimitation of its frontiers or boundaries. @@ -239,54 +189,34 @@ - - - - - Definition take from: http://xmlns.com/foaf/spec/#term_based_near . foaf indicates that the status of this term is "unstable". "The based_near relationship relates two "spatial things" (anything that can be somewhere), the latter typically described using the geo:lat / geo:long geo-positioning vocabulary (http://www.w3.org/2003/01/geo/wgs84_pos#). This allows us to say describe the typical latitute and longitude of, say, a Person (people are spatial things - they can be places) without implying that a precise location has been given." Used to link an agent, related to bibliographic things, to a place where it is based near: can be a city, a monument, a building, etc. - - - - - Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - - + + + The most general classification of a person - - + + + - - - + + + - + - 1 - - - - - 1 - - - - - - + + http://purl.org/ontology/bibo/ @@ -296,47 +226,17 @@ Starting page number within a continuous page range. stable - - - - - - - - - - - - - 1 - - - - - 1 - - - - - - - - - - - - @@ -345,25 +245,10 @@ http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - + - 1 - - - - - - - - - - - - - - - 1 - + 1 + @@ -384,10 +269,15 @@ - + - - + 1 + + + + + + @@ -395,11 +285,6 @@ - - - 1 - - Smaller administrative division into which a country may be divided. @@ -408,15 +293,36 @@ Short definition was partially taken from http://en.wikipedia.org/wiki/Subnational_entity. - - - 1 - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -425,46 +331,20 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + 1 - + @@ -473,11 +353,6 @@ - - - - - @@ -488,6 +363,11 @@ + + + 1 + + http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -501,16 +381,6 @@ http://www.fao.org/termportal/contr/fr/ FAO terminology - - - 1 - - - - - - - 2010-06-24 @@ -531,11 +401,6 @@ - - - 1 - - @@ -543,15 +408,15 @@ - - + + - + - + - 1 - + 1 + @@ -567,24 +432,14 @@ http://purl.org/ontology/bibo/ something that is printed or published and distributed, esp. a given number of a periodical - + + - - - - - 1 - - - - - - @@ -609,6 +464,11 @@ + + + + + UN Statistics Division http://unstats.un.org/unsd/methods/m49/m49alpha.htm @@ -619,15 +479,10 @@ UN Statistics Division - + - - - - - - - + + http://faostat.fao.org @@ -639,7 +494,7 @@ http://faostat.fao.org/default.aspx?lang=es FAOSTAT http://faostat.fao.org - + @@ -648,37 +503,32 @@ - - - - - Currently being used by a restriction on organization. - + + + - - - - - + + + + + + + 1 + A short written piece focused on an event or announcement of note, having a defined publication time and of less enduring interest than a news feature. - - - - - @@ -710,13 +560,18 @@ - + Authorship of journal articles, books and other original works is a means by which academics communicate the results of their scholarly work, establish priority for their discoveries, and build their reputation among their peers. This class allows for linking an author to a publication while indicating information about that author's authorship. Contains the authors name, their rank in the publication, and whether or not they are a corresponding author on the publication. Currently any abstract name is given to members of this class. This could change in the future. + + + + + A seminar, discussion group, or the like, that emphasizes zxchange of ideas and the demonstration and application of techniques, skills, etc. stable @@ -725,15 +580,10 @@ This class allows for linking an author to a publication while indicating inform Bibo Definition: A seminar, discussion group, or the like, that emphasizes exchange of ideas and the demonstration and application of techniques, skills, etc. - + + - - - - - - - + @@ -753,11 +603,11 @@ This class allows for linking an author to a publication while indicating inform stable - + Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio Independent organizations formally working together toward a common goal, under an expressed agreement - + @@ -767,25 +617,40 @@ This class allows for linking an author to a publication while indicating inform - - - + + + A group of related documents issued at regular intervals. http://purl.org/ontology/bibo/ stable - + + + + + + + + + 1 + + + + + 1 + + http://www.fao.org/termportal/contr/ar/ @@ -812,10 +677,20 @@ This class allows for linking an author to a publication while indicating inform Short Definition take from http://en.wiktionary.org/wiki/continent. - + + + - - + + + + + + + + + 1 + @@ -835,11 +710,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ 2010-06-24 - - - - - @@ -872,11 +742,26 @@ This class allows for linking an author to a publication while indicating inform + + + + + + + + 1 + + - + + + 1 + + + @@ -888,6 +773,11 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + FAO terminology http://www.fao.org/termportal/contr/es/ @@ -909,6 +799,11 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + @@ -952,19 +847,9 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - - - - - 1 - + + + @@ -975,12 +860,32 @@ This class allows for linking an author to a publication while indicating inform A legal decision that affirms a ruling. + + + + + + + + + + + + + + + + + + 1 + + Something designed, built, installed, etc., to serve a specific function or activity affording a convenience or service. Distinct from the organization that runs it; e.g., a laboratory may be an organization but may be run by another organization and only consist of facilities housing equipment or services. Can be a building or place that provides a particular service or is used for a particular activity. Use the specific Building or Room whenever possible. Short definition from http://dictionary.reference.com/browse/facility. @@ -988,20 +893,20 @@ This class allows for linking an author to a publication while indicating inform Use subclasses of core:Facility subclasses instead of this class if possible - - - - - A gathering of people for a defined purpose, not necessarily public or announced - + + + + + + @@ -1043,10 +948,10 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/es/ - + - 1 - + + @@ -1055,10 +960,10 @@ This class allows for linking an author to a publication while indicating inform - + + - - + @@ -1070,6 +975,16 @@ This class allows for linking an author to a publication while indicating inform Either city or town - a thickly populated area having fixed boundaries and certain local powers of government. + + + 1 + + + + + + + @@ -1080,20 +995,30 @@ This class allows for linking an author to a publication while indicating inform That is a position held by an academic faculty member who works for administration. - - Associate Dean An academic administrative position (associate dean, etc.) as distinct from a professional administrative position (non-academic) + + + server; Bruker Vector-33 FT-IR - + + A network server is one example. Medical schools and research laboratories can list professional equipment, such as microscopes. - A physical object provided for specific purpose, task or occupation. - + + + + + + + + + + @@ -1105,28 +1030,23 @@ This class allows for linking an author to a publication while indicating inform - + http://purl.org/ontology/bibo/ A specific journal article + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a periodical or book - Short Definition modified from the bibo ontology. - A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine. + stable - - - - - - + Director of Admissions and Placement; Associate University Librarian Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. - + An employment activity, whether compensated or not. Short definition comes from http://en.wikipedia.org/wiki/Position, and has been modified. @@ -1153,8 +1073,8 @@ This class allows for linking an author to a publication while indicating inform + An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials - @@ -1168,20 +1088,10 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - - - Relates a document to an event; for example, a paper to a conference. @@ -1222,26 +1132,21 @@ This class allows for linking an author to a publication while indicating inform + + + + + Use for teaching roles other than specific for-credit courses within a person's home institution. Use for teaching experiences other than specific for-credit courses within a person's home institution. - - - - - - - - - - - + 1 - + @@ -1260,20 +1165,15 @@ This class allows for linking an author to a publication while indicating inform US Patent Data; US Job Data A named collection of data, usually containing only one type of data - - - - - - - - + + + - Computer program and its related documentation; directs the operation of a computer + @@ -1309,10 +1209,15 @@ This class allows for linking an author to a publication while indicating inform - + - - + + + + + + + http://www.fao.org/termportal/contr/es/ @@ -1328,11 +1233,6 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 http://www.fao.org/termportal/contr/en/ - - - - - My extension program consists of developing and reporting disease management strategies that are both economically and environmentally sound for fresh market vegetable production. We hope that some of this testing will result in practices adaptable for organic production. @@ -1359,10 +1259,10 @@ This class allows for linking an author to a publication while indicating inform 020530902X - + - 1 - + + @@ -1375,16 +1275,11 @@ This class allows for linking an author to a publication while indicating inform Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - + - + - - - - - @@ -1403,20 +1298,35 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 FAO terminology - - + - + 1 + - + + + 1 + + + + + + + + + + + + + + + - 1 - - - stable + + A scholarly academic article, typically published in a journal. @@ -1435,26 +1345,16 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - - - stable http://purl.org/ontology/bibo/ Digital Object Identifier - + - - + 1 + @@ -1475,10 +1375,20 @@ This class allows for linking an author to a publication while indicating inform http://www.un.org/Depts/Cartographic/french/htmain.htm UN Cartographic Section - + - - + 1 + + + + + + + + + + + @@ -1486,11 +1396,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - http://purl.org/dc/terms/ http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html @@ -1499,11 +1404,6 @@ This class allows for linking an author to a publication while indicating inform A summary of the resource. stable - - - 1 - - Role of a person designated by a grantee to direct a project or activity being supported by a grant, and who is accountable to the grantee for the proper conduct of the project or activity. Also known as Program Director or Project Director. @@ -1529,11 +1429,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/en/ - - - - - http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -1572,10 +1467,10 @@ This class allows for linking an author to a publication while indicating inform Definition taken from: http://en.wikipedia.org/wiki/University - University of Florida; Washington University in St. Louis An institution of higher education and research, which grants academic degrees in a variety of subjects, and provides both undergraduate education and postgraduate education. + @@ -1583,15 +1478,10 @@ This class allows for linking an author to a publication while indicating inform Definition from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html - + - 1 - - - - - - + + @@ -1599,27 +1489,17 @@ This class allows for linking an author to a publication while indicating inform It's anticipated that the subclasses will be used when classifying items. And, all locations can be viewable via this class. Use subclasses of core:Location when classsifying items. - - - - - A document created as a basis for discussion or a very early draft of a formal paper - - + + - - - - - @@ -1639,11 +1519,6 @@ This class allows for linking an author to a publication while indicating inform International Standard Serial Number - - - 1 - - @@ -1651,11 +1526,6 @@ This class allows for linking an author to a publication while indicating inform source of definition: http://www.uspto.gov/main/glossary/#p . The following site has patent number formats: http://www.uspto.gov/patents/ebc/kindcodesum.jsp . - - - 1 - - @@ -1664,7 +1534,6 @@ This class allows for linking an author to a publication while indicating inform - http://purl.org/ontology/bibo/ @@ -1673,6 +1542,7 @@ This class allows for linking an author to a publication while indicating inform A periodical of scholarly journal Articles. Contains original scholarly research or review articles by experts in the field Journal of Information Science; IEEE Intelligent System; Scientometrics + http://purl.org/ontology/bibo/ @@ -1683,20 +1553,10 @@ This class allows for linking an author to a publication while indicating inform Contains news articles, opinions, features, advertising, and is usually issued daily or weekly - + - - - - - - 1 - - - - 1 - - + + @@ -1715,25 +1575,20 @@ This class allows for linking an author to a publication while indicating inform FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/fr/ - - - - - - - - - - - + + + + + + @@ -1747,25 +1602,20 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + - - - - - - + + - - Wiley Prize in Biomedical Sciences + An Award or Honor An Award or Honor @@ -1782,16 +1632,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - - - - - - http://purl.org/ontology/bibo/ @@ -1801,20 +1641,20 @@ This class allows for linking an author to a publication while indicating inform An agent that receives a communication document. - - - - - - - - Only use if no specific subclasses of core:EventSeries desribe the activity. + + + + + + Only use if no specific subclasses of core:EventSeries desribe the activity. A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. - - + Two or more events that follow on one after the other or are connected one after the other. - + + + + @@ -1829,10 +1669,10 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + @@ -1845,11 +1685,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - one keyword or phrase per freetextKeyword assertion @@ -1858,10 +1693,15 @@ This class allows for linking an author to a publication while indicating inform use one freetextKeyword assertion for each keyword or phrase. - - - + + 1 + + + + + + @@ -1869,6 +1709,16 @@ use one freetextKeyword assertion for each keyword or phrase. We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. + + + 1 + + + + + 1 + + @@ -1881,22 +1731,27 @@ We would like the range of core:outcome to be the union of Event and Process; an - + Represents educational training that has been received. This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree. Currently any abstract name is given to individuals of this class. This could change in the future. - + - + + + + + + + + - 1 - - - + A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue + @@ -1905,14 +1760,19 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + http://purl.org/ontology/bibo/ Facebook; VIVOweb.org; Flickr A group of Webpages accessible on the Web. + A group of webpages available within a specific parent address or URL on the World Wide Web - unstable @@ -1928,16 +1788,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/zh/ - - - - - + Work consisting of collections of previously published works - Short Definition is the Medical Subject Heading (MeSH) definition A document that simultaneously contains other documents. http://purl.org/ontology/bibo/ @@ -1948,13 +1803,23 @@ We would like the range of core:outcome to be the union of Event and Process; an a reified relationship + + + + + + + + 1 + + - An area of corporate activity organized as an administrative or functional unit. + Definition modified from http://www.thefreedictionary.com/division. It is difficult to tell the difference between a division and a department. Cardiovascular Medicine (division within medicine) @@ -1965,11 +1830,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - @@ -1978,16 +1838,11 @@ We would like the range of core:outcome to be the union of Event and Process; an VIVO Outreach Team; VIVO Ontology Team - An informal organization brought together for the purposes of a project or event. + - - - 1 - - In the future we may be able to make this a defined class that would not need to be directly asserted, but the consensus seems to be that some organizations "are" clinical and some "are" research organizations and that the distinction is important enough to warrant the additional class and class assertions Any organization with a significant clinical function as a matter of course and not just through occasional clinical roles @@ -2010,6 +1865,11 @@ We would like the range of core:outcome to be the union of Event and Process; an An institution that provides medical, surgical, or psychiatric care and treatment for the sick or the injured. + + + + + stable @@ -2022,11 +1882,11 @@ We would like the range of core:outcome to be the union of Event and Process; an - Alchohol Education Center; Center for Arts and Public Policy; Hearing Research Center A place where a particular activity or service is concentrated. Short Definition take from http://www.thefreedictionary.com/center. + Country area, area of the country including area under inland water bodies, but excluding offshore territorial waters. Possible variations in the data may be due to updating and revisions of the country data and not necessarily to any change of area. Data are expressed in 1000 hectares. http://faostat.fao.org/site/375/default.aspx @@ -2039,15 +1899,15 @@ We would like the range of core:outcome to be the union of Event and Process; an http://faostat.fao.org/site/377/default.aspx FAOSTAT http://faostat.fao.org/site/377/default.aspx - - - - - Indicates the precision of the value of a DateTimeValue instance. + + + 1 + + For example an HR job title for a person might be - Assistant University Librarian, and the preferred job title for that same person could be - Physical Sciences Librarian. @@ -2056,14 +1916,14 @@ We would like the range of core:outcome to be the union of Event and Process; an + Short Definition from OCLC Input Standards, EntW + A document created to summarize research findings associated with the completion of an academic degree. - stable http://purl.org/ontology/bibo/ Works created to satisfy the requirements for an academic certification or degree; also called dissertation - @@ -2073,10 +1933,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + + - - @@ -2097,29 +1957,24 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + - - + Only use if no specific subclasses of core:Role describe the role. - - + A person's or organization's type of contribution to an endeavor Only use this broad role class if no subclasses of role describe the item being classified. + - - - 1 - - @@ -2133,14 +1988,14 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - + + + + + @@ -2156,16 +2011,11 @@ We would like the range of core:outcome to be the union of Event and Process; an UN Cartographic Section UN Cartographic Section - - - - - A structured file of information or a set of logically related data stored and retrieved using computer-based means Short Definition is the Medical Subject Heading (MeSH) definition - + PubMed @@ -2177,8 +2027,8 @@ We would like the range of core:outcome to be the union of Event and Process; an stable - http://purl.org/ontology/bibo/ + A meeting for consultation or discussion. 2010 International Congress on Autoimmunity; American Libraries Association 2009 core:Seminar and bibo:Conference are very similar. @@ -2194,28 +2044,48 @@ We would like the range of core:outcome to be the union of Event and Process; an - A distinct, usually ongoing and specialized unit within a large organization. Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division. Legal (department within a company); Use for any non-academic department + + + + + 1 + + + + + + + + + + + - + An online article or commentary appearing on a blog A specific blog posting + + + + 2 + Collection of documents or information resources that have a unified identity stable - Collection of documents or information resources that have a unified identity. Archives, museums and libraries often acquire collections on specific subjects and from distinguished authors or researchers. Also includes collections of resources bundled into a license. http://purl.org/ontology/bibo/ Hill Ornithology Collection; Wiley Interscience Online Books Biochemisty Collection + A collection of Documents or Collections @@ -2240,18 +2110,13 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - - + B.A. Bachelor of Arts This list may have multiple abbreviations for some degrees. + An academic degree at any level, both as reported by individuals for employment and as offered by academic degree programs. - @@ -2269,6 +2134,21 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal document proposing or enacting a law or a group of laws. + + + 1 + + + + + + + + + + + + Minnesota; Michigan; Indiana; New York; Quebec; Manitoba; Ontario Source of the Short Definition: http://www.thefreedictionary.com/state. @@ -2276,6 +2156,11 @@ We would like the range of core:outcome to be the union of Event and Process; an One of a number of areas or communities having their own governments and forming a federation under a sovereign government, as in the US. + + + + + http://purl.org/ontology/bibo/ @@ -2299,7 +2184,7 @@ We would like the range of core:outcome to be the union of Event and Process; an - + phonograph record; tape; CD; DVD; DAT An audio document; aka record. @@ -2307,6 +2192,11 @@ We would like the range of core:outcome to be the union of Event and Process; an stable Recorded audio in any format + + + 1 + + http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49chgef.htm @@ -2328,15 +2218,10 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ - + - 1 - - - - - - + + FAO terminology @@ -2356,9 +2241,9 @@ We would like the range of core:outcome to be the union of Event and Process; an film; video; Blu-ray Audiovisual recording in any format - stable + An audio-visual document; film, video, and so forth. @@ -2369,6 +2254,11 @@ We would like the range of core:outcome to be the union of Event and Process; an An area of land distinguished by its political autonomy. Politically independent territories. + + + 1 + + Use subclasses of core:Geographic Region subclasses instead of this class if possible. @@ -2396,6 +2286,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://xmlns.com/foaf/spec/#term_lastName. Note from foaf: "The lastName property is provided (alongside firstName) as a mechanism to support legacy data that cannot be easily interpreted in terms of the (otherwise preferred) familyName and givenName properties. The concepts of 'first' and 'last' names do not work well across cultural and linguistic boundaries; however they are widely used in addressbooks and databases." + + + 1 + + @@ -2405,6 +2300,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + UN cartographic maps (http://www.un.org/Depts/Cartographic/map/profile/world.pdf) @@ -2429,6 +2329,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + @@ -2438,32 +2343,52 @@ We would like the range of core:outcome to be the union of Event and Process; an A defined class of organizations that fund Grants. - National Institute of Health (NIH) + + + + + + - Definition found here: http://dictionary.reference.com/browse/publisher A person or company whose business is the publishing of books, periodicals, engravings, computer software, etc. Elsevier; Harper & Row; Indiana University Press + - + + - 1 - + + + + + + + + + 1 + + + + + + + A student organization is an organization, operated by students at a university, whose membership normally consists only of students. Dancin' Gators @@ -2476,6 +2401,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Afghanistan; Antigua and Barbuda; Cameroon; Iceland; Jamaica; Nigeria; United States of America + + + + + @@ -2484,6 +2414,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + 2010-06-24 @@ -2505,17 +2440,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - The full URL. Uniform Resource Locator (URL) specifies where an identified resource is available and the mechanism for retrieving it. + http://info.slis.indiana.edu/~katy/ - - - - - @@ -2534,6 +2464,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -2542,6 +2477,16 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable + + + + + + + + 1 + + http://www.fao.org/termportal/contr/ar/ @@ -2556,6 +2501,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + + + @@ -2577,15 +2527,10 @@ We would like the range of core:outcome to be the union of Event and Process; an Public Definition source (http://www.answers.com/topic/publisher). - + - 1 - - - - - - + + @@ -2593,19 +2538,24 @@ We would like the range of core:outcome to be the union of Event and Process; an Institute for Fundamental Theory + + + + + - This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. - Only use if no specific subclasses of foaf:organization desribe the organization. A generic class encompassing several types of organizations. - - - + + + + + + + - - Ued to describe an organization related to bibliographic items such as a publishing company, etc. @@ -2621,11 +2571,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - - - @@ -2637,6 +2582,11 @@ We would like the range of core:outcome to be the union of Event and Process; an A Person holding an academic employment appointment focused on research rather than teaching; temporary (or for some defined term) + + + 1 + + @@ -2645,9 +2595,19 @@ We would like the range of core:outcome to be the union of Event and Process; an definition modified from: source (http://en.wikipedia.org/wiki/Seating_capacity). 55 - + + + 1 + + + + + - + + + + @@ -2655,11 +2615,6 @@ We would like the range of core:outcome to be the union of Event and Process; an The digital file (or physical equivalent), if available after the conference, vs. the act of attending/presenting: use ConferencePresentation for information about date/time/location/name of the event where the poster was presented - - - - - An organized series of workshop events, whether repetitions of the same workshop or multiple different workshops. Use workshop for individual events. @@ -2671,10 +2626,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + + @@ -2688,29 +2643,29 @@ We would like the range of core:outcome to be the union of Event and Process; an - - + - - Only use if no specific subclasses of event:Event are appropriate. This class will also display instances of subclasses under Event, e.g. Philosophy Department Discussion Club; 2009 Racker Lecture; screening of a documentary. In addition to a location in space and time, an event may have any or all the following qualities: actively participating agents, passive factors, work products. Also, it may be in a virtual space or part of a series such as a lecture series. The previous short definition was: "An arbitrary classification of a space/time region, by a cognitive agent." - - - + + + + + + + Something that happens at a given place and time. - - - - - + + + + - + - - + + @@ -2720,11 +2675,6 @@ The previous short definition was: "An arbitrary classification of a space/time http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - - - - - http://www.fao.org/termportal/en/ @@ -2738,10 +2688,20 @@ The previous short definition was: "An arbitrary classification of a space/time http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - + - - + + + + + + 1 + + + + + + @@ -2749,12 +2709,22 @@ The previous short definition was: "An arbitrary classification of a space/time + + + 1 + + + + + + + A visual representation such as a photograph or graph @@ -2779,25 +2749,20 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - - - - 1 - - - + + - + An award, honor, or distinction received by a person on a particular date (not the award itself as given repeatedly, and not a grant award). - A specific award on a particular date or for a particular date range. Ninth annual Wiley Prize in Biomedical Sciences, for the discovery of a light activated ion channel + + + + + @@ -2805,11 +2770,6 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - Short Definition from the bibo ontology http://purl.org/ontology/bibo/ @@ -2831,18 +2791,28 @@ The previous short definition was: "An arbitrary classification of a space/time Role of co-principal investigator of a grant, who devotes a specified percentage of time and is considered key personnel. - - - + + + + + + + 1 + + + + + + - Professor, associate professor and assistant professor are common positions for academic faculty. + Professor; Associate Professor; Assistant Professor Academic position in a university or institution - + @@ -2857,27 +2827,12 @@ The previous short definition was: "An arbitrary classification of a space/time The dual relationship of a professor advising a student and the student being advised by a professor, typically including start and end dates - + - + - - - - - - - - - - - - - - - - + @@ -2889,11 +2844,6 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - @@ -2915,21 +2865,11 @@ modern society using the world of Star trek. Los Angeles Times, March An section number - - - - - - - - 1 - - http://www.fao.org/termportal/contr/en/ http://www.fao.org/termportal/contr/es/ @@ -2948,11 +2888,6 @@ modern society using the world of Star trek. Los Angeles Times, March This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - - - http://purl.org/ontology/bibo/ @@ -2961,32 +2896,22 @@ modern society using the world of Star trek. Los Angeles Times, March An agent that interview another agent. - - - + - - - - - + 1 + - - - - - - + + + - - @@ -3000,16 +2925,6 @@ modern society using the world of Star trek. Los Angeles Times, March a specific period or duration, defined by (optional) start and end date/times. - - - 1 - - - - - - - @@ -3026,25 +2941,10 @@ modern society using the world of Star trek. Los Angeles Times, March Short Definition from bibo ontology - + - - - - - - - - - - - - - - - - - + + @@ -3075,10 +2975,10 @@ modern society using the world of Star trek. Los Angeles Times, March - + - - + + @@ -3092,10 +2992,10 @@ modern society using the world of Star trek. Los Angeles Times, March - + - 1 - + + @@ -3109,17 +3009,17 @@ source: http://en.wikipedia.org/wiki/ORCID . + + + 1 + + Used to link a bibliographic item to its publisher. Public definition source: http://dublincore.org/2008/01/14/dcterms.rdf# . Examples of a Publisher include a person, an organization, or a service. Typically, the name of a Publisher should be used to indicate the entity. - - - - - FAO terminology http://www.fao.org/termportal/en/ @@ -3158,15 +3058,10 @@ Examples of a Publisher include a person, an organization, or a service. Typical A presentation of a series of slides, usually presented in front of an audience with written text and images. stable - - - - - - - - + + + @@ -3200,6 +3095,11 @@ Examples of a Publisher include a person, an organization, or a service. Typical http://purl.org/ontology/bibo/ + + + 1 + + http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -3213,49 +3113,29 @@ Examples of a Publisher include a person, an organization, or a service. Typical 2010-06-24 - - - - - Resource dependent on other entities This class is here so it can be equivalent to vitro:DependentResource. Deletion in the VIVO system behaves differently when deleting members of this class: related individuals may need to be deleted as well. - + - - - - - - - - - - - - + + A distinct, usually specialized educational unit within an educational organization. - + - + Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts) - + + + - 1 - - - - - - @@ -3282,6 +3162,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/A passage selected from a larger work. http://purl.org/ontology/bibo/ + + + 1 + + @@ -3292,22 +3177,27 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + + + - An intramural or extramural award to support scholarly work, such as UF09179 (VIVO) Short definition is from the Glossary of NIH Terms. - + Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity - - + Written musical composition for voice or instruments or both + + + + + 2010-06-24 http://www.fao.org/termportal/contr/ar/ @@ -3336,11 +3226,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Information Science; Computer Science; Anthropology - - - - - This namespace - http://purl.org/dc/elements/1.1/ - does not appear to have this element. @@ -3350,11 +3235,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - @@ -3375,6 +3255,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/2010-06-24 http://www.fao.org/termportal/en/ + + + + + Universal Product Code @@ -3389,6 +3274,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3396,20 +3286,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/Intel Talent Search; poetry contest Not the same as an award or distinction. - + - - + + - - - - - - - - + + + @@ -3431,6 +3316,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3443,20 +3333,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ An academic course, normally but not always for credit - - - - - 0.7 - - - 1 - - http://purl.org/ontology/bibo/ New Yorker @@ -3469,19 +3349,19 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Address has properties for department name, street, city, state or province, postal code, and country. For US specific address, classify using core:US Postal Code. core:Address will display all addresses. + University of Waterloo, 200 University Avenue West, Waterloo, Ontario, Canada N2L 3G1 - A code and abstract concept expressing a location on the Earth's surface. To classify US specific addresses, use core:US Postal Code. + Librarian; Library Systems Analyst; Music Bibliographer It is the common position in libraries. A position held by library and information science professionals, or academic or technical experts, in support of providing information services or materials - + - http://www.fao.org/termportal/contr/zh/ @@ -3496,30 +3376,25 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/es/ - + - - - - - - 1 - - - - - - + + - + + + + + + + + - - @@ -3528,11 +3403,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - http://purl.org/ontology/bibo/ stable @@ -3548,15 +3418,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - + + - + - 1 - + + @@ -3564,6 +3434,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A group of agents + + + + + http://purl.org/ontology/bibo/ unstable @@ -3572,11 +3447,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/A chapter of a book. A main division of a book + + + + + Curriculum Steering Committee; PhD Advisory Committee - + A group of people organized for a specific purpose (e.g., a reporting or advisory role), often with a charge and for a specific duration. There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important. @@ -3597,11 +3477,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/http://purl.org/ontology/bibo/ a document that states some contractual relationship or grants some right - - - 1 - - @@ -3613,28 +3488,28 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + + + - - This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - + 1 - + - + 1320 East 10th Street, Wells Library 021 Bloomington, IN 47405 - - Formal address in US postal address system. + + US postal address follow the format street, apt or office number (optional), city, state, and zipcode. @@ -3648,6 +3523,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + + 1 + + + @@ -3662,16 +3547,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print. - - + Short Definition from the bibo ontology unstable - - A section of a book + + http://purl.org/ontology/bibo/ + A section of a book. @@ -3685,20 +3570,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - 1 - - - - - - - - - - 1 - + + @@ -3723,6 +3598,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable + + + 1 + + @@ -3730,6 +3610,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + Definition was take from here: http://dictionary.reference.com/browse/museum @@ -3737,6 +3622,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/The Getty Museum A building or place where works of art, scientific specimens, or other objects of permanent value are kept and displayed. + + + + + unstable http://purl.org/ontology/bibo/ @@ -3745,17 +3635,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + Indiana; Florida; Minnesota; Michigan; New York; Quebec; Manitoba; Ontario - - - 1 - - FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -3779,34 +3669,34 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - + + + + + + + + 1 + + - - - - - @@ -3820,6 +3710,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + + + 1 + + A small reference book, especially one giving instructions. unstable @@ -3829,11 +3729,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/SDB User Manual - - - 1 - - sub-Saharan Africa, North America @@ -3849,11 +3744,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3866,10 +3756,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ B.A. - + 1 - + @@ -3888,15 +3778,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + - - - - - - + + @@ -3931,10 +3816,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + - + 1 + @@ -3950,6 +3835,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + @@ -3984,15 +3874,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - - - - - - + + @@ -4043,10 +3928,15 @@ bibo has the domain of this property set to the union of Collection and Document - + - - + 1 + + + + + 1 + @@ -4061,6 +3951,11 @@ bibo has the domain of this property set to the union of Collection and Document 2010-06-24 + + + + + FAO terminology @@ -4074,16 +3969,6 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/ar/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - - - - - - - 2 - @@ -4100,31 +3985,41 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + + + + + + - - + + - + - - + 1 + @@ -4152,6 +4047,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + 1 + + http://www.fao.org/termportal/contr/es/ @@ -4189,17 +4089,17 @@ bibo has the domain of this property set to the union of Collection and Document - - + + Short Definition from the bibo ontology + stable - http://purl.org/ontology/bibo/ - - + A document (noun) is a bounded physical representation of body of information designed with the capacity (and usually intent) to communicate. A document may manifest symbolic, diagrammatic or sensory-representational information. + A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate @@ -4232,11 +4132,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - Short Definition from the bibo ontology @@ -4251,6 +4146,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + 1 + + FAO terminology http://www.fao.org/termportal/contr/ar/ @@ -4273,28 +4173,38 @@ bibo has the domain of this property set to the union of Collection and Document The Uniform Code Council (UCC) was the Numbering Organization in the USA to administer and manage the EAN.UCC System. In 2005 the UCC changed its name to GS1 US. European Article Number/Uniform Commercier Code 13 + + + + + Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. - - - 1 - - + An edited book. - http://purl.org/ontology/bibo/ - Best American Science Writing 2009 stable An edited collection of stand-alone articles published as a book - - + + + + + + + + + + + + + Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible. @@ -4309,11 +4219,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - 100 Caldwell Hall; 114 Martha Van Rensselaer (Rushmore Conference Room) Room that provides a particular service or is used for a particular activity. @@ -4324,46 +4229,46 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - + + 1 + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + @@ -4371,10 +4276,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Medicine - + - 1 - + + http://www.fao.org/termportal/en/ @@ -4417,24 +4322,24 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi College of Arts & Sciences; Ivy Tech Community College - A primary academic unit within a University or a free-standing higher education organization without graduate degree programs. + Document1 isVersionOf Document2 This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - - - - + 1 - + + + + + + @@ -4476,11 +4381,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Collection of legal cases stable - - - - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/en/ @@ -4494,25 +4394,25 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - + 1 - - - - - 1 - + - + - + - 1 - + + + + + + + @@ -4524,11 +4424,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - @@ -4538,10 +4433,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi UITS service UITS service is the information technology services provided by Indiana University. SC. + A regularly offered service in support of an academic, research, or administrative function (not personal or professional service by an individual) - - + @@ -4549,10 +4444,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - + + 1 + @@ -4562,16 +4457,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. - - - - - Cornell Ithaca; Cornell Geneva; Cornell New York City; Cornell Qatar @@ -4579,11 +4474,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi The grounds of a school, college, university, or hospital. Or, a large, usually suburban, landscaped business or industrial site. - - - 1 - - @@ -4610,10 +4500,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi This is done with a restriction on agent. - + - - + + Code of Federal Regulations @@ -4625,30 +4515,20 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi A work consisting of texts of rules and regulations related to statutes issued by executive or administrative agencies A collection of statutes. - - - - - - - - - - An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support + + + - - - - + + Used information from this definition: http://dictionary.reference.com/browse/library. - A collection of any materials, for study and enjoyment, which has been systematically arranged. Marston Science Library @@ -4658,6 +4538,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + A public performance. @@ -4666,6 +4551,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ + + + 1 + + + + + + + http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -4679,17 +4574,17 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + + + - - - - - @@ -4702,20 +4597,15 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - - - - - - - - - - + + + + + @@ -4723,25 +4613,30 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi full email address + + + 1 + + We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - - Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. - - - - - - - - + 1 - + + + + + Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. + + + + + @@ -4749,11 +4644,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Chicago; New York; Bloomington; Gainesville - - - - - @@ -4761,26 +4651,21 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - For data ingest from authoritative sources to record the actual way a person was listed as author, as potentially valuable information for author disambiguation. + + + + + A person who has already received a bachelor's degree and is working toward a Master's or Doctoral degree. - - - 1 - - @@ -4798,29 +4683,14 @@ We would like the range of core:outcome to be the union of Event and Process; an http://aims.fao.org/website/Search-AGROVOC/sub http://aims.fao.org/website/Search-AGROVOC/sub - - - - - - - - 1 - - Used to link a bibliographic item to one of its contributor: can be an author, an editor, a publisher, etc. - + - - - - - - - + + @@ -4854,22 +4724,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - administrative secretary Definition http://en.wikipedia.org/wiki/Job_title#Job_title. - - - - - @@ -4889,21 +4749,11 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - - - - - - + Medical Subject Heading (MeSH) definition of Technical Report: Work consisting of a formal report giving details of the investigation and results of a medical or other scientific problem. When issued by a government agency or comparable official body, its contents may be classified, unclassified, or declassified with regard to security clearance. This publication type may also cover a scientific paper or article that records the current state or current position of scientific research and development. If so labeled by the editor or publisher, this publication type may be properly used for journal articles. A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc.. - http://purl.org/ontology/bibo/ A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc. @@ -4927,6 +4777,16 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/es/ FAO terminology + + + + + + + + + + 2010-06-24 http://www.fao.org/termportal/en/ @@ -4940,20 +4800,35 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/fr/ + + + + + + + + + + + + + 1 + + - - - + - - - - + + + + + + @@ -4964,18 +4839,33 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - + + + + + + + + + + + + + + + + + + 1 + + + @@ -4997,10 +4887,10 @@ We would like the range of core:outcome to be the union of Event and Process; an An organized series of a meeting for consultation or discussion. - + - 1 - + + @@ -5017,24 +4907,19 @@ We would like the range of core:outcome to be the union of Event and Process; an Short Definition from the bibo ontology - A position involving academic work but without faculty status Researcher; Academic Extension Associate; Postdoctoral Associate - + Those positions are held by people who do academic work but do not have faculty positions in universities or institutes. + - - - - - Currently being used by a restriction on organization. @@ -5054,23 +4939,58 @@ We would like the range of core:outcome to be the union of Event and Process; an An outreach or community service role directed outside a person's primary profession and institution Communicating Astronomy to the Public + + + + + + + + + + + + + 1 + + + + + + + stable - A loose, thematic, collection of Documents, often Books. + A thematic collection of documents, usually books, issued at regular or irregular intervals http://purl.org/ontology/bibo/ - + Methods in Molecular Biology + + + 1 + + + + + + + + + + + + Definition take from: http://dictionary.reference.com/browse/foundation. An institution financed by a donation or legacy to aid research, education, the arts, etc. @@ -5087,11 +5007,6 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal decision on appeal that takes action on a case (affirming it, reversing it, etc.). - - - - - CODEN became particularly common in the scientific community as a citation system for periodicals cited in technical- as well in chemistry-related publications and as a search tool in many bibliographic catalogues. @@ -5112,16 +5027,36 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - - + 1 + + + + + + + + + + 1 + + + + + 1 + The showing of an object or a collection of objects, in an organized manner. + + + + + @@ -5131,17 +5066,17 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - Short Definition modified from the one found here: http://www.thefreedictionary.com/county. Alachua; Baker; Bradford; Kenora; Ottawa; Waterloo The largest administrative division of most states or provinces. + - + - 1 - + + @@ -5158,6 +5093,16 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + 1 + + + + + + + @@ -5166,39 +5111,34 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + + + - - - - - - 1 - + Short Definition from the bibo ontology A distinct part of a larger document or collected document http://purl.org/ontology/bibo/ - a distinct part of a larger document or collected document. + unstable - + - + + Short Definition copied from bibo ontology - - - + + http://purl.org/ontology/bibo/ - + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers. - A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers stable @@ -5209,11 +5149,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - @@ -5223,28 +5158,58 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + 1 + + + + + 1 + @@ -5252,11 +5217,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - @@ -5280,14 +5240,9 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Note: Bibo:editor is used as the inverse of core:editorOf. Public Description for bibo:editor was obtained from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - - - - - - + + - @@ -5295,12 +5250,32 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A postdoctoral training appointment (job) + + + + + + + + 1 + + + + + + + + + + 1 + + @@ -5311,11 +5286,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - @@ -5328,16 +5298,21 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + + + 1 + + + + + + + + - - - 1 - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/es/ @@ -5356,11 +5331,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - @@ -5368,11 +5338,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - @@ -5381,6 +5346,21 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + + + + + + + + + + + The name defining a special edition of a document. Normally its a literal value composed of a version number and words. @@ -5388,6 +5368,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://purl.org/ontology/bibo/ + + + + + FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/zh/ @@ -5401,35 +5386,35 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/termportal/en/ 2010-06-24 - - - + + + - + 1 - + - - + - + + + + + + + - - - 1 - - 2010-04-01 UN Statistics Division http://unstats.un.org/unsd/methods/m49/m49alpha.htm @@ -5440,6 +5425,21 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49alpha.htm + + + + + + + + + + + + + + + paraphrased editorial note from the bibo ontology: We are not defining, using an enumeration, the range of the bibo:status to be a defined list of bibo:DocumentStatus. This is because we want people to be able to define new statuses if needed; and creating such an enumeration would prevent this. @@ -5448,9 +5448,9 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A list of items in a collection; an ordered compilation of item descriptions and sufficient information to afford access to them - + + - NLM Catalog Short Definition is the Medical Subject Heading (MeSH) definition diff --git a/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf b/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf index ccabefa0..2b17f38c 100644 --- a/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf +++ b/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf @@ -3616,10 +3616,10 @@ - hasPrerequisite + hasPrerequisite true - hasPrerequisite + has prerequisite diff --git a/productMods/WEB-INF/submodels/scires-1.2.owl b/productMods/WEB-INF/submodels/scires-1.2.owl index eae63da2..0b30406d 100644 --- a/productMods/WEB-INF/submodels/scires-1.2.owl +++ b/productMods/WEB-INF/submodels/scires-1.2.owl @@ -27,11 +27,11 @@ number of human participants in the study (trial). + An implement used to facilitate work, especially precision work. An implement used to facilitate work, especially precision work. - A plan specification that allows different domain experts to reliably and independently reproduce a process. @@ -140,11 +140,6 @@ NOTE: For now we are not addressing whether this is a subclass of foaf:AgentA clinical trial is a research study using human volunteers to answer questions about treatments for diseases and conditions. Clinical trials are conducted in phases. The trials at each phase have a different purpose and help scientists answer different questions. A research study using human volunteers to answer specifc health-related questions. - - - - - @@ -162,4 +157,9 @@ NOTE: For now we are not addressing whether this is a subclass of foaf:Agent + + + + + diff --git a/productMods/WEB-INF/submodels/vivo-core-1.2.owl b/productMods/WEB-INF/submodels/vivo-core-1.2.owl index e1d1b7c2..bfd3101c 100644 --- a/productMods/WEB-INF/submodels/vivo-core-1.2.owl +++ b/productMods/WEB-INF/submodels/vivo-core-1.2.owl @@ -25,11 +25,6 @@ A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available in PubMed Central. The PMCID is issued shortly after the PI or author approves the PubMed Central formatted web version of the submission. - - - - - http://purl.org/ontology/bibo/ Short Definition from bibo ontology @@ -54,27 +49,12 @@ - - - - - - - - 1 - - - - - - - For individual seminars, use seminar instead. core:ConferenceSeries and core:SeminarSeries are very similar. @@ -82,23 +62,13 @@ An organized series of a meeting for an exchange of ideas, typically put on by a department or center. - - - - - - - + - - - - - 1 - + + @@ -123,12 +93,12 @@ - + UN Cartographic Section UN Cartographic Section - + - + @@ -136,34 +106,24 @@ - - - 1 - - - + Accounting & Research Services Assistant; Director of Information Technology Staff, support, and other non-academic positions. A position classified as professional, staff, support, or any other non-academic role - + - - - - - http://purl.org/ontology/bibo/ A sub property of identifier (http://en.wikipedia.org/wiki/SICI). @@ -172,15 +132,10 @@ Serial Item and Contribution Identifier - - - - - - - - + + 1 + @@ -220,11 +175,6 @@ - - - 1 - - FAO's geopolitical ontology version 1.1 was populated with FAO, UN and internationally recognized data sources. FAO DISCLAIMER: The designations employed and the presentation of material do not imply the expression of any opinion whatsoever on the part of the Food and Agriculture Organization of the United Nations concerning the legal status of any country, territory, city or area, or of its authorities, or concerning the delimitation of its frontiers or boundaries. @@ -239,54 +189,34 @@ - - - - - Definition take from: http://xmlns.com/foaf/spec/#term_based_near . foaf indicates that the status of this term is "unstable". "The based_near relationship relates two "spatial things" (anything that can be somewhere), the latter typically described using the geo:lat / geo:long geo-positioning vocabulary (http://www.w3.org/2003/01/geo/wgs84_pos#). This allows us to say describe the typical latitute and longitude of, say, a Person (people are spatial things - they can be places) without implying that a precise location has been given." Used to link an agent, related to bibliographic things, to a place where it is based near: can be a city, a monument, a building, etc. - - - - - Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - - + + + The most general classification of a person - - + + + - - - + + + - + - 1 - - - - - 1 - - - - - - + + http://purl.org/ontology/bibo/ @@ -296,47 +226,17 @@ Starting page number within a continuous page range. stable - - - - - - - - - - - - - 1 - - - - - 1 - - - - - - - - - - - - @@ -345,25 +245,10 @@ http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - + - 1 - - - - - - - - - - - - - - - 1 - + 1 + @@ -384,10 +269,15 @@ - + - - + 1 + + + + + + @@ -395,11 +285,6 @@ - - - 1 - - Smaller administrative division into which a country may be divided. @@ -408,15 +293,36 @@ Short definition was partially taken from http://en.wikipedia.org/wiki/Subnational_entity. - - - 1 - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -425,46 +331,20 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + 1 - + @@ -473,11 +353,6 @@ - - - - - @@ -488,6 +363,11 @@ + + + 1 + + http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -501,16 +381,6 @@ http://www.fao.org/termportal/contr/fr/ FAO terminology - - - 1 - - - - - - - 2010-06-24 @@ -531,11 +401,6 @@ - - - 1 - - @@ -543,15 +408,15 @@ - - + + - + - + - 1 - + 1 + @@ -567,24 +432,14 @@ http://purl.org/ontology/bibo/ something that is printed or published and distributed, esp. a given number of a periodical - + + - - - - - 1 - - - - - - @@ -609,6 +464,11 @@ + + + + + UN Statistics Division http://unstats.un.org/unsd/methods/m49/m49alpha.htm @@ -619,15 +479,10 @@ UN Statistics Division - + - - - - - - - + + http://faostat.fao.org @@ -639,7 +494,7 @@ http://faostat.fao.org/default.aspx?lang=es FAOSTAT http://faostat.fao.org - + @@ -648,37 +503,32 @@ - - - - - Currently being used by a restriction on organization. - + + + - - - - - + + + + + + + 1 + A short written piece focused on an event or announcement of note, having a defined publication time and of less enduring interest than a news feature. - - - - - @@ -710,13 +560,18 @@ - + Authorship of journal articles, books and other original works is a means by which academics communicate the results of their scholarly work, establish priority for their discoveries, and build their reputation among their peers. This class allows for linking an author to a publication while indicating information about that author's authorship. Contains the authors name, their rank in the publication, and whether or not they are a corresponding author on the publication. Currently any abstract name is given to members of this class. This could change in the future. + + + + + A seminar, discussion group, or the like, that emphasizes zxchange of ideas and the demonstration and application of techniques, skills, etc. stable @@ -725,15 +580,10 @@ This class allows for linking an author to a publication while indicating inform Bibo Definition: A seminar, discussion group, or the like, that emphasizes exchange of ideas and the demonstration and application of techniques, skills, etc. - + + - - - - - - - + @@ -753,11 +603,11 @@ This class allows for linking an author to a publication while indicating inform stable - + Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio Independent organizations formally working together toward a common goal, under an expressed agreement - + @@ -767,25 +617,40 @@ This class allows for linking an author to a publication while indicating inform - - - + + + A group of related documents issued at regular intervals. http://purl.org/ontology/bibo/ stable - + + + + + + + + + 1 + + + + + 1 + + http://www.fao.org/termportal/contr/ar/ @@ -812,10 +677,20 @@ This class allows for linking an author to a publication while indicating inform Short Definition take from http://en.wiktionary.org/wiki/continent. - + + + - - + + + + + + + + + 1 + @@ -835,11 +710,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ 2010-06-24 - - - - - @@ -872,11 +742,26 @@ This class allows for linking an author to a publication while indicating inform + + + + + + + + 1 + + - + + + 1 + + + @@ -888,6 +773,11 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + FAO terminology http://www.fao.org/termportal/contr/es/ @@ -909,6 +799,11 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + @@ -952,19 +847,9 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - - - - - 1 - + + + @@ -975,12 +860,32 @@ This class allows for linking an author to a publication while indicating inform A legal decision that affirms a ruling. + + + + + + + + + + + + + + + + + + 1 + + Something designed, built, installed, etc., to serve a specific function or activity affording a convenience or service. Distinct from the organization that runs it; e.g., a laboratory may be an organization but may be run by another organization and only consist of facilities housing equipment or services. Can be a building or place that provides a particular service or is used for a particular activity. Use the specific Building or Room whenever possible. Short definition from http://dictionary.reference.com/browse/facility. @@ -988,20 +893,20 @@ This class allows for linking an author to a publication while indicating inform Use subclasses of core:Facility subclasses instead of this class if possible - - - - - A gathering of people for a defined purpose, not necessarily public or announced - + + + + + + @@ -1043,10 +948,10 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/es/ - + - 1 - + + @@ -1055,10 +960,10 @@ This class allows for linking an author to a publication while indicating inform - + + - - + @@ -1070,6 +975,16 @@ This class allows for linking an author to a publication while indicating inform Either city or town - a thickly populated area having fixed boundaries and certain local powers of government. + + + 1 + + + + + + + @@ -1080,20 +995,30 @@ This class allows for linking an author to a publication while indicating inform That is a position held by an academic faculty member who works for administration. - - Associate Dean An academic administrative position (associate dean, etc.) as distinct from a professional administrative position (non-academic) + + + server; Bruker Vector-33 FT-IR - + + A network server is one example. Medical schools and research laboratories can list professional equipment, such as microscopes. - A physical object provided for specific purpose, task or occupation. - + + + + + + + + + + @@ -1105,28 +1030,23 @@ This class allows for linking an author to a publication while indicating inform - + http://purl.org/ontology/bibo/ A specific journal article + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a periodical or book - Short Definition modified from the bibo ontology. - A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine. + stable - - - - - - + Director of Admissions and Placement; Associate University Librarian Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. - + An employment activity, whether compensated or not. Short definition comes from http://en.wikipedia.org/wiki/Position, and has been modified. @@ -1153,8 +1073,8 @@ This class allows for linking an author to a publication while indicating inform + An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials - @@ -1168,20 +1088,10 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - - - Relates a document to an event; for example, a paper to a conference. @@ -1222,26 +1132,21 @@ This class allows for linking an author to a publication while indicating inform + + + + + Use for teaching roles other than specific for-credit courses within a person's home institution. Use for teaching experiences other than specific for-credit courses within a person's home institution. - - - - - - - - - - - + 1 - + @@ -1260,20 +1165,15 @@ This class allows for linking an author to a publication while indicating inform US Patent Data; US Job Data A named collection of data, usually containing only one type of data - - - - - - - - + + + - Computer program and its related documentation; directs the operation of a computer + @@ -1309,10 +1209,15 @@ This class allows for linking an author to a publication while indicating inform - + - - + + + + + + + http://www.fao.org/termportal/contr/es/ @@ -1328,11 +1233,6 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 http://www.fao.org/termportal/contr/en/ - - - - - My extension program consists of developing and reporting disease management strategies that are both economically and environmentally sound for fresh market vegetable production. We hope that some of this testing will result in practices adaptable for organic production. @@ -1359,10 +1259,10 @@ This class allows for linking an author to a publication while indicating inform 020530902X - + - 1 - + + @@ -1375,16 +1275,11 @@ This class allows for linking an author to a publication while indicating inform Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - + - + - - - - - @@ -1403,20 +1298,35 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 FAO terminology - - + - + 1 + - + + + 1 + + + + + + + + + + + + + + + - 1 - - - stable + + A scholarly academic article, typically published in a journal. @@ -1435,26 +1345,16 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - - - stable http://purl.org/ontology/bibo/ Digital Object Identifier - + - - + 1 + @@ -1475,10 +1375,20 @@ This class allows for linking an author to a publication while indicating inform http://www.un.org/Depts/Cartographic/french/htmain.htm UN Cartographic Section - + - - + 1 + + + + + + + + + + + @@ -1486,11 +1396,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - http://purl.org/dc/terms/ http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html @@ -1499,11 +1404,6 @@ This class allows for linking an author to a publication while indicating inform A summary of the resource. stable - - - 1 - - Role of a person designated by a grantee to direct a project or activity being supported by a grant, and who is accountable to the grantee for the proper conduct of the project or activity. Also known as Program Director or Project Director. @@ -1529,11 +1429,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/en/ - - - - - http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -1572,10 +1467,10 @@ This class allows for linking an author to a publication while indicating inform Definition taken from: http://en.wikipedia.org/wiki/University - University of Florida; Washington University in St. Louis An institution of higher education and research, which grants academic degrees in a variety of subjects, and provides both undergraduate education and postgraduate education. + @@ -1583,15 +1478,10 @@ This class allows for linking an author to a publication while indicating inform Definition from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html - + - 1 - - - - - - + + @@ -1599,27 +1489,17 @@ This class allows for linking an author to a publication while indicating inform It's anticipated that the subclasses will be used when classifying items. And, all locations can be viewable via this class. Use subclasses of core:Location when classsifying items. - - - - - A document created as a basis for discussion or a very early draft of a formal paper - - + + - - - - - @@ -1639,11 +1519,6 @@ This class allows for linking an author to a publication while indicating inform International Standard Serial Number - - - 1 - - @@ -1651,11 +1526,6 @@ This class allows for linking an author to a publication while indicating inform source of definition: http://www.uspto.gov/main/glossary/#p . The following site has patent number formats: http://www.uspto.gov/patents/ebc/kindcodesum.jsp . - - - 1 - - @@ -1664,7 +1534,6 @@ This class allows for linking an author to a publication while indicating inform - http://purl.org/ontology/bibo/ @@ -1673,6 +1542,7 @@ This class allows for linking an author to a publication while indicating inform A periodical of scholarly journal Articles. Contains original scholarly research or review articles by experts in the field Journal of Information Science; IEEE Intelligent System; Scientometrics + http://purl.org/ontology/bibo/ @@ -1683,20 +1553,10 @@ This class allows for linking an author to a publication while indicating inform Contains news articles, opinions, features, advertising, and is usually issued daily or weekly - + - - - - - - 1 - - - - 1 - - + + @@ -1715,25 +1575,20 @@ This class allows for linking an author to a publication while indicating inform FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/fr/ - - - - - - - - - - - + + + + + + @@ -1747,25 +1602,20 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + - - - - - - + + - - Wiley Prize in Biomedical Sciences + An Award or Honor An Award or Honor @@ -1782,16 +1632,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - - - - - - http://purl.org/ontology/bibo/ @@ -1801,20 +1641,20 @@ This class allows for linking an author to a publication while indicating inform An agent that receives a communication document. - - - - - - - - Only use if no specific subclasses of core:EventSeries desribe the activity. + + + + + + Only use if no specific subclasses of core:EventSeries desribe the activity. A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. - - + Two or more events that follow on one after the other or are connected one after the other. - + + + + @@ -1829,10 +1669,10 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + @@ -1845,11 +1685,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - one keyword or phrase per freetextKeyword assertion @@ -1858,10 +1693,15 @@ This class allows for linking an author to a publication while indicating inform use one freetextKeyword assertion for each keyword or phrase. - - - + + 1 + + + + + + @@ -1869,6 +1709,16 @@ use one freetextKeyword assertion for each keyword or phrase. We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. + + + 1 + + + + + 1 + + @@ -1881,22 +1731,27 @@ We would like the range of core:outcome to be the union of Event and Process; an - + Represents educational training that has been received. This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree. Currently any abstract name is given to individuals of this class. This could change in the future. - + - + + + + + + + + - 1 - - - + A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue + @@ -1905,14 +1760,19 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + http://purl.org/ontology/bibo/ Facebook; VIVOweb.org; Flickr A group of Webpages accessible on the Web. + A group of webpages available within a specific parent address or URL on the World Wide Web - unstable @@ -1928,16 +1788,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/zh/ - - - - - + Work consisting of collections of previously published works - Short Definition is the Medical Subject Heading (MeSH) definition A document that simultaneously contains other documents. http://purl.org/ontology/bibo/ @@ -1948,13 +1803,23 @@ We would like the range of core:outcome to be the union of Event and Process; an a reified relationship + + + + + + + + 1 + + - An area of corporate activity organized as an administrative or functional unit. + Definition modified from http://www.thefreedictionary.com/division. It is difficult to tell the difference between a division and a department. Cardiovascular Medicine (division within medicine) @@ -1965,11 +1830,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - @@ -1978,16 +1838,11 @@ We would like the range of core:outcome to be the union of Event and Process; an VIVO Outreach Team; VIVO Ontology Team - An informal organization brought together for the purposes of a project or event. + - - - 1 - - In the future we may be able to make this a defined class that would not need to be directly asserted, but the consensus seems to be that some organizations "are" clinical and some "are" research organizations and that the distinction is important enough to warrant the additional class and class assertions Any organization with a significant clinical function as a matter of course and not just through occasional clinical roles @@ -2010,6 +1865,11 @@ We would like the range of core:outcome to be the union of Event and Process; an An institution that provides medical, surgical, or psychiatric care and treatment for the sick or the injured. + + + + + stable @@ -2022,11 +1882,11 @@ We would like the range of core:outcome to be the union of Event and Process; an - Alchohol Education Center; Center for Arts and Public Policy; Hearing Research Center A place where a particular activity or service is concentrated. Short Definition take from http://www.thefreedictionary.com/center. + Country area, area of the country including area under inland water bodies, but excluding offshore territorial waters. Possible variations in the data may be due to updating and revisions of the country data and not necessarily to any change of area. Data are expressed in 1000 hectares. http://faostat.fao.org/site/375/default.aspx @@ -2039,15 +1899,15 @@ We would like the range of core:outcome to be the union of Event and Process; an http://faostat.fao.org/site/377/default.aspx FAOSTAT http://faostat.fao.org/site/377/default.aspx - - - - - Indicates the precision of the value of a DateTimeValue instance. + + + 1 + + For example an HR job title for a person might be - Assistant University Librarian, and the preferred job title for that same person could be - Physical Sciences Librarian. @@ -2056,14 +1916,14 @@ We would like the range of core:outcome to be the union of Event and Process; an + Short Definition from OCLC Input Standards, EntW + A document created to summarize research findings associated with the completion of an academic degree. - stable http://purl.org/ontology/bibo/ Works created to satisfy the requirements for an academic certification or degree; also called dissertation - @@ -2073,10 +1933,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + + - - @@ -2097,29 +1957,24 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + - - + Only use if no specific subclasses of core:Role describe the role. - - + A person's or organization's type of contribution to an endeavor Only use this broad role class if no subclasses of role describe the item being classified. + - - - 1 - - @@ -2133,14 +1988,14 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - + + + + + @@ -2156,16 +2011,11 @@ We would like the range of core:outcome to be the union of Event and Process; an UN Cartographic Section UN Cartographic Section - - - - - A structured file of information or a set of logically related data stored and retrieved using computer-based means Short Definition is the Medical Subject Heading (MeSH) definition - + PubMed @@ -2177,8 +2027,8 @@ We would like the range of core:outcome to be the union of Event and Process; an stable - http://purl.org/ontology/bibo/ + A meeting for consultation or discussion. 2010 International Congress on Autoimmunity; American Libraries Association 2009 core:Seminar and bibo:Conference are very similar. @@ -2194,28 +2044,48 @@ We would like the range of core:outcome to be the union of Event and Process; an - A distinct, usually ongoing and specialized unit within a large organization. Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division. Legal (department within a company); Use for any non-academic department + + + + + 1 + + + + + + + + + + + - + An online article or commentary appearing on a blog A specific blog posting + + + + 2 + Collection of documents or information resources that have a unified identity stable - Collection of documents or information resources that have a unified identity. Archives, museums and libraries often acquire collections on specific subjects and from distinguished authors or researchers. Also includes collections of resources bundled into a license. http://purl.org/ontology/bibo/ Hill Ornithology Collection; Wiley Interscience Online Books Biochemisty Collection + A collection of Documents or Collections @@ -2240,18 +2110,13 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - - + B.A. Bachelor of Arts This list may have multiple abbreviations for some degrees. + An academic degree at any level, both as reported by individuals for employment and as offered by academic degree programs. - @@ -2269,6 +2134,21 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal document proposing or enacting a law or a group of laws. + + + 1 + + + + + + + + + + + + Minnesota; Michigan; Indiana; New York; Quebec; Manitoba; Ontario Source of the Short Definition: http://www.thefreedictionary.com/state. @@ -2276,6 +2156,11 @@ We would like the range of core:outcome to be the union of Event and Process; an One of a number of areas or communities having their own governments and forming a federation under a sovereign government, as in the US. + + + + + http://purl.org/ontology/bibo/ @@ -2299,7 +2184,7 @@ We would like the range of core:outcome to be the union of Event and Process; an - + phonograph record; tape; CD; DVD; DAT An audio document; aka record. @@ -2307,6 +2192,11 @@ We would like the range of core:outcome to be the union of Event and Process; an stable Recorded audio in any format + + + 1 + + http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49chgef.htm @@ -2328,15 +2218,10 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ - + - 1 - - - - - - + + FAO terminology @@ -2356,9 +2241,9 @@ We would like the range of core:outcome to be the union of Event and Process; an film; video; Blu-ray Audiovisual recording in any format - stable + An audio-visual document; film, video, and so forth. @@ -2369,6 +2254,11 @@ We would like the range of core:outcome to be the union of Event and Process; an An area of land distinguished by its political autonomy. Politically independent territories. + + + 1 + + Use subclasses of core:Geographic Region subclasses instead of this class if possible. @@ -2396,6 +2286,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://xmlns.com/foaf/spec/#term_lastName. Note from foaf: "The lastName property is provided (alongside firstName) as a mechanism to support legacy data that cannot be easily interpreted in terms of the (otherwise preferred) familyName and givenName properties. The concepts of 'first' and 'last' names do not work well across cultural and linguistic boundaries; however they are widely used in addressbooks and databases." + + + 1 + + @@ -2405,6 +2300,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + UN cartographic maps (http://www.un.org/Depts/Cartographic/map/profile/world.pdf) @@ -2429,6 +2329,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + @@ -2438,32 +2343,52 @@ We would like the range of core:outcome to be the union of Event and Process; an A defined class of organizations that fund Grants. - National Institute of Health (NIH) + + + + + + - Definition found here: http://dictionary.reference.com/browse/publisher A person or company whose business is the publishing of books, periodicals, engravings, computer software, etc. Elsevier; Harper & Row; Indiana University Press + - + + - 1 - + + + + + + + + + 1 + + + + + + + A student organization is an organization, operated by students at a university, whose membership normally consists only of students. Dancin' Gators @@ -2476,6 +2401,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Afghanistan; Antigua and Barbuda; Cameroon; Iceland; Jamaica; Nigeria; United States of America + + + + + @@ -2484,6 +2414,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + 2010-06-24 @@ -2505,17 +2440,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - The full URL. Uniform Resource Locator (URL) specifies where an identified resource is available and the mechanism for retrieving it. + http://info.slis.indiana.edu/~katy/ - - - - - @@ -2534,6 +2464,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -2542,6 +2477,16 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable + + + + + + + + 1 + + http://www.fao.org/termportal/contr/ar/ @@ -2556,6 +2501,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + + + @@ -2577,15 +2527,10 @@ We would like the range of core:outcome to be the union of Event and Process; an Public Definition source (http://www.answers.com/topic/publisher). - + - 1 - - - - - - + + @@ -2593,19 +2538,24 @@ We would like the range of core:outcome to be the union of Event and Process; an Institute for Fundamental Theory + + + + + - This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. - Only use if no specific subclasses of foaf:organization desribe the organization. A generic class encompassing several types of organizations. - - - + + + + + + + - - Ued to describe an organization related to bibliographic items such as a publishing company, etc. @@ -2621,11 +2571,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - - - @@ -2637,6 +2582,11 @@ We would like the range of core:outcome to be the union of Event and Process; an A Person holding an academic employment appointment focused on research rather than teaching; temporary (or for some defined term) + + + 1 + + @@ -2645,9 +2595,19 @@ We would like the range of core:outcome to be the union of Event and Process; an definition modified from: source (http://en.wikipedia.org/wiki/Seating_capacity). 55 - + + + 1 + + + + + - + + + + @@ -2655,11 +2615,6 @@ We would like the range of core:outcome to be the union of Event and Process; an The digital file (or physical equivalent), if available after the conference, vs. the act of attending/presenting: use ConferencePresentation for information about date/time/location/name of the event where the poster was presented - - - - - An organized series of workshop events, whether repetitions of the same workshop or multiple different workshops. Use workshop for individual events. @@ -2671,10 +2626,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + + @@ -2688,29 +2643,29 @@ We would like the range of core:outcome to be the union of Event and Process; an - - + - - Only use if no specific subclasses of event:Event are appropriate. This class will also display instances of subclasses under Event, e.g. Philosophy Department Discussion Club; 2009 Racker Lecture; screening of a documentary. In addition to a location in space and time, an event may have any or all the following qualities: actively participating agents, passive factors, work products. Also, it may be in a virtual space or part of a series such as a lecture series. The previous short definition was: "An arbitrary classification of a space/time region, by a cognitive agent." - - - + + + + + + + Something that happens at a given place and time. - - - - - + + + + - + - - + + @@ -2720,11 +2675,6 @@ The previous short definition was: "An arbitrary classification of a space/time http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - - - - - http://www.fao.org/termportal/en/ @@ -2738,10 +2688,20 @@ The previous short definition was: "An arbitrary classification of a space/time http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - + - - + + + + + + 1 + + + + + + @@ -2749,12 +2709,22 @@ The previous short definition was: "An arbitrary classification of a space/time + + + 1 + + + + + + + A visual representation such as a photograph or graph @@ -2779,25 +2749,20 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - - - - 1 - - - + + - + An award, honor, or distinction received by a person on a particular date (not the award itself as given repeatedly, and not a grant award). - A specific award on a particular date or for a particular date range. Ninth annual Wiley Prize in Biomedical Sciences, for the discovery of a light activated ion channel + + + + + @@ -2805,11 +2770,6 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - Short Definition from the bibo ontology http://purl.org/ontology/bibo/ @@ -2831,18 +2791,28 @@ The previous short definition was: "An arbitrary classification of a space/time Role of co-principal investigator of a grant, who devotes a specified percentage of time and is considered key personnel. - - - + + + + + + + 1 + + + + + + - Professor, associate professor and assistant professor are common positions for academic faculty. + Professor; Associate Professor; Assistant Professor Academic position in a university or institution - + @@ -2857,27 +2827,12 @@ The previous short definition was: "An arbitrary classification of a space/time The dual relationship of a professor advising a student and the student being advised by a professor, typically including start and end dates - + - + - - - - - - - - - - - - - - - - + @@ -2889,11 +2844,6 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - @@ -2915,21 +2865,11 @@ modern society using the world of Star trek. Los Angeles Times, March An section number - - - - - - - - 1 - - http://www.fao.org/termportal/contr/en/ http://www.fao.org/termportal/contr/es/ @@ -2948,11 +2888,6 @@ modern society using the world of Star trek. Los Angeles Times, March This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - - - http://purl.org/ontology/bibo/ @@ -2961,32 +2896,22 @@ modern society using the world of Star trek. Los Angeles Times, March An agent that interview another agent. - - - + - - - - - + 1 + - - - - - - + + + - - @@ -3000,16 +2925,6 @@ modern society using the world of Star trek. Los Angeles Times, March a specific period or duration, defined by (optional) start and end date/times. - - - 1 - - - - - - - @@ -3026,25 +2941,10 @@ modern society using the world of Star trek. Los Angeles Times, March Short Definition from bibo ontology - + - - - - - - - - - - - - - - - - - + + @@ -3075,10 +2975,10 @@ modern society using the world of Star trek. Los Angeles Times, March - + - - + + @@ -3092,10 +2992,10 @@ modern society using the world of Star trek. Los Angeles Times, March - + - 1 - + + @@ -3109,17 +3009,17 @@ source: http://en.wikipedia.org/wiki/ORCID . + + + 1 + + Used to link a bibliographic item to its publisher. Public definition source: http://dublincore.org/2008/01/14/dcterms.rdf# . Examples of a Publisher include a person, an organization, or a service. Typically, the name of a Publisher should be used to indicate the entity. - - - - - FAO terminology http://www.fao.org/termportal/en/ @@ -3158,15 +3058,10 @@ Examples of a Publisher include a person, an organization, or a service. Typical A presentation of a series of slides, usually presented in front of an audience with written text and images. stable - - - - - - - - + + + @@ -3200,6 +3095,11 @@ Examples of a Publisher include a person, an organization, or a service. Typical http://purl.org/ontology/bibo/ + + + 1 + + http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -3213,49 +3113,29 @@ Examples of a Publisher include a person, an organization, or a service. Typical 2010-06-24 - - - - - Resource dependent on other entities This class is here so it can be equivalent to vitro:DependentResource. Deletion in the VIVO system behaves differently when deleting members of this class: related individuals may need to be deleted as well. - + - - - - - - - - - - - - + + A distinct, usually specialized educational unit within an educational organization. - + - + Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts) - + + + - 1 - - - - - - @@ -3282,6 +3162,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/A passage selected from a larger work. http://purl.org/ontology/bibo/ + + + 1 + + @@ -3292,22 +3177,27 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + + + - An intramural or extramural award to support scholarly work, such as UF09179 (VIVO) Short definition is from the Glossary of NIH Terms. - + Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity - - + Written musical composition for voice or instruments or both + + + + + 2010-06-24 http://www.fao.org/termportal/contr/ar/ @@ -3336,11 +3226,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Information Science; Computer Science; Anthropology - - - - - This namespace - http://purl.org/dc/elements/1.1/ - does not appear to have this element. @@ -3350,11 +3235,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - @@ -3375,6 +3255,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/2010-06-24 http://www.fao.org/termportal/en/ + + + + + Universal Product Code @@ -3389,6 +3274,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3396,20 +3286,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/Intel Talent Search; poetry contest Not the same as an award or distinction. - + - - + + - - - - - - - - + + + @@ -3431,6 +3316,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3443,20 +3333,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ An academic course, normally but not always for credit - - - - - 0.7 - - - 1 - - http://purl.org/ontology/bibo/ New Yorker @@ -3469,19 +3349,19 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Address has properties for department name, street, city, state or province, postal code, and country. For US specific address, classify using core:US Postal Code. core:Address will display all addresses. + University of Waterloo, 200 University Avenue West, Waterloo, Ontario, Canada N2L 3G1 - A code and abstract concept expressing a location on the Earth's surface. To classify US specific addresses, use core:US Postal Code. + Librarian; Library Systems Analyst; Music Bibliographer It is the common position in libraries. A position held by library and information science professionals, or academic or technical experts, in support of providing information services or materials - + - http://www.fao.org/termportal/contr/zh/ @@ -3496,30 +3376,25 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/es/ - + - - - - - - 1 - - - - - - + + - + + + + + + + + - - @@ -3528,11 +3403,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - http://purl.org/ontology/bibo/ stable @@ -3548,15 +3418,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - + + - + - 1 - + + @@ -3564,6 +3434,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A group of agents + + + + + http://purl.org/ontology/bibo/ unstable @@ -3572,11 +3447,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/A chapter of a book. A main division of a book + + + + + Curriculum Steering Committee; PhD Advisory Committee - + A group of people organized for a specific purpose (e.g., a reporting or advisory role), often with a charge and for a specific duration. There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important. @@ -3597,11 +3477,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/http://purl.org/ontology/bibo/ a document that states some contractual relationship or grants some right - - - 1 - - @@ -3613,28 +3488,28 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + + + - - This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - + 1 - + - + 1320 East 10th Street, Wells Library 021 Bloomington, IN 47405 - - Formal address in US postal address system. + + US postal address follow the format street, apt or office number (optional), city, state, and zipcode. @@ -3648,6 +3523,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + + 1 + + + @@ -3662,16 +3547,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print. - - + Short Definition from the bibo ontology unstable - - A section of a book + + http://purl.org/ontology/bibo/ + A section of a book. @@ -3685,20 +3570,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - 1 - - - - - - - - - - 1 - + + @@ -3723,6 +3598,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable + + + 1 + + @@ -3730,6 +3610,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + Definition was take from here: http://dictionary.reference.com/browse/museum @@ -3737,6 +3622,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/The Getty Museum A building or place where works of art, scientific specimens, or other objects of permanent value are kept and displayed. + + + + + unstable http://purl.org/ontology/bibo/ @@ -3745,17 +3635,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + Indiana; Florida; Minnesota; Michigan; New York; Quebec; Manitoba; Ontario - - - 1 - - FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -3779,34 +3669,34 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - + + + + + + + + 1 + + - - - - - @@ -3820,6 +3710,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + + + 1 + + A small reference book, especially one giving instructions. unstable @@ -3829,11 +3729,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/SDB User Manual - - - 1 - - sub-Saharan Africa, North America @@ -3849,11 +3744,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3866,10 +3756,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ B.A. - + 1 - + @@ -3888,15 +3778,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + - - - - - - + + @@ -3931,10 +3816,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + - + 1 + @@ -3950,6 +3835,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + @@ -3984,15 +3874,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - - - - - - + + @@ -4043,10 +3928,15 @@ bibo has the domain of this property set to the union of Collection and Document - + - - + 1 + + + + + 1 + @@ -4061,6 +3951,11 @@ bibo has the domain of this property set to the union of Collection and Document 2010-06-24 + + + + + FAO terminology @@ -4074,16 +3969,6 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/ar/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - - - - - - - 2 - @@ -4100,31 +3985,41 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + + + + + + - - + + - + - - + 1 + @@ -4152,6 +4047,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + 1 + + http://www.fao.org/termportal/contr/es/ @@ -4189,17 +4089,17 @@ bibo has the domain of this property set to the union of Collection and Document - - + + Short Definition from the bibo ontology + stable - http://purl.org/ontology/bibo/ - - + A document (noun) is a bounded physical representation of body of information designed with the capacity (and usually intent) to communicate. A document may manifest symbolic, diagrammatic or sensory-representational information. + A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate @@ -4232,11 +4132,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - Short Definition from the bibo ontology @@ -4251,6 +4146,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + 1 + + FAO terminology http://www.fao.org/termportal/contr/ar/ @@ -4273,28 +4173,38 @@ bibo has the domain of this property set to the union of Collection and Document The Uniform Code Council (UCC) was the Numbering Organization in the USA to administer and manage the EAN.UCC System. In 2005 the UCC changed its name to GS1 US. European Article Number/Uniform Commercier Code 13 + + + + + Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. - - - 1 - - + An edited book. - http://purl.org/ontology/bibo/ - Best American Science Writing 2009 stable An edited collection of stand-alone articles published as a book - - + + + + + + + + + + + + + Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible. @@ -4309,11 +4219,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - 100 Caldwell Hall; 114 Martha Van Rensselaer (Rushmore Conference Room) Room that provides a particular service or is used for a particular activity. @@ -4324,46 +4229,46 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - + + 1 + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + @@ -4371,10 +4276,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Medicine - + - 1 - + + http://www.fao.org/termportal/en/ @@ -4417,24 +4322,24 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi College of Arts & Sciences; Ivy Tech Community College - A primary academic unit within a University or a free-standing higher education organization without graduate degree programs. + Document1 isVersionOf Document2 This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - - - - + 1 - + + + + + + @@ -4476,11 +4381,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Collection of legal cases stable - - - - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/en/ @@ -4494,25 +4394,25 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - + 1 - - - - - 1 - + - + - + - 1 - + + + + + + + @@ -4524,11 +4424,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - @@ -4538,10 +4433,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi UITS service UITS service is the information technology services provided by Indiana University. SC. + A regularly offered service in support of an academic, research, or administrative function (not personal or professional service by an individual) - - + @@ -4549,10 +4444,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - + + 1 + @@ -4562,16 +4457,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. - - - - - Cornell Ithaca; Cornell Geneva; Cornell New York City; Cornell Qatar @@ -4579,11 +4474,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi The grounds of a school, college, university, or hospital. Or, a large, usually suburban, landscaped business or industrial site. - - - 1 - - @@ -4610,10 +4500,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi This is done with a restriction on agent. - + - - + + Code of Federal Regulations @@ -4625,30 +4515,20 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi A work consisting of texts of rules and regulations related to statutes issued by executive or administrative agencies A collection of statutes. - - - - - - - - - - An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support + + + - - - - + + Used information from this definition: http://dictionary.reference.com/browse/library. - A collection of any materials, for study and enjoyment, which has been systematically arranged. Marston Science Library @@ -4658,6 +4538,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + A public performance. @@ -4666,6 +4551,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ + + + 1 + + + + + + + http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -4679,17 +4574,17 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + + + - - - - - @@ -4702,20 +4597,15 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - - - - - - - - - - + + + + + @@ -4723,25 +4613,30 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi full email address + + + 1 + + We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - - Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. - - - - - - - - + 1 - + + + + + Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. + + + + + @@ -4749,11 +4644,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Chicago; New York; Bloomington; Gainesville - - - - - @@ -4761,26 +4651,21 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - For data ingest from authoritative sources to record the actual way a person was listed as author, as potentially valuable information for author disambiguation. + + + + + A person who has already received a bachelor's degree and is working toward a Master's or Doctoral degree. - - - 1 - - @@ -4798,29 +4683,14 @@ We would like the range of core:outcome to be the union of Event and Process; an http://aims.fao.org/website/Search-AGROVOC/sub http://aims.fao.org/website/Search-AGROVOC/sub - - - - - - - - 1 - - Used to link a bibliographic item to one of its contributor: can be an author, an editor, a publisher, etc. - + - - - - - - - + + @@ -4854,22 +4724,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - administrative secretary Definition http://en.wikipedia.org/wiki/Job_title#Job_title. - - - - - @@ -4889,21 +4749,11 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - - - - - - + Medical Subject Heading (MeSH) definition of Technical Report: Work consisting of a formal report giving details of the investigation and results of a medical or other scientific problem. When issued by a government agency or comparable official body, its contents may be classified, unclassified, or declassified with regard to security clearance. This publication type may also cover a scientific paper or article that records the current state or current position of scientific research and development. If so labeled by the editor or publisher, this publication type may be properly used for journal articles. A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc.. - http://purl.org/ontology/bibo/ A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc. @@ -4927,6 +4777,16 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/es/ FAO terminology + + + + + + + + + + 2010-06-24 http://www.fao.org/termportal/en/ @@ -4940,20 +4800,35 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/fr/ + + + + + + + + + + + + + 1 + + - - - + - - - - + + + + + + @@ -4964,18 +4839,33 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - + + + + + + + + + + + + + + + + + + 1 + + + @@ -4997,10 +4887,10 @@ We would like the range of core:outcome to be the union of Event and Process; an An organized series of a meeting for consultation or discussion. - + - 1 - + + @@ -5017,24 +4907,19 @@ We would like the range of core:outcome to be the union of Event and Process; an Short Definition from the bibo ontology - A position involving academic work but without faculty status Researcher; Academic Extension Associate; Postdoctoral Associate - + Those positions are held by people who do academic work but do not have faculty positions in universities or institutes. + - - - - - Currently being used by a restriction on organization. @@ -5054,23 +4939,58 @@ We would like the range of core:outcome to be the union of Event and Process; an An outreach or community service role directed outside a person's primary profession and institution Communicating Astronomy to the Public + + + + + + + + + + + + + 1 + + + + + + + stable - A loose, thematic, collection of Documents, often Books. + A thematic collection of documents, usually books, issued at regular or irregular intervals http://purl.org/ontology/bibo/ - + Methods in Molecular Biology + + + 1 + + + + + + + + + + + + Definition take from: http://dictionary.reference.com/browse/foundation. An institution financed by a donation or legacy to aid research, education, the arts, etc. @@ -5087,11 +5007,6 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal decision on appeal that takes action on a case (affirming it, reversing it, etc.). - - - - - CODEN became particularly common in the scientific community as a citation system for periodicals cited in technical- as well in chemistry-related publications and as a search tool in many bibliographic catalogues. @@ -5112,16 +5027,36 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - - + 1 + + + + + + + + + + 1 + + + + + 1 + The showing of an object or a collection of objects, in an organized manner. + + + + + @@ -5131,17 +5066,17 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - Short Definition modified from the one found here: http://www.thefreedictionary.com/county. Alachua; Baker; Bradford; Kenora; Ottawa; Waterloo The largest administrative division of most states or provinces. + - + - 1 - + + @@ -5158,6 +5093,16 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + 1 + + + + + + + @@ -5166,39 +5111,34 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + + + - - - - - - 1 - + Short Definition from the bibo ontology A distinct part of a larger document or collected document http://purl.org/ontology/bibo/ - a distinct part of a larger document or collected document. + unstable - + - + + Short Definition copied from bibo ontology - - - + + http://purl.org/ontology/bibo/ - + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers. - A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers stable @@ -5209,11 +5149,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - @@ -5223,28 +5158,58 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + 1 + + + + + 1 + @@ -5252,11 +5217,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - @@ -5280,14 +5240,9 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Note: Bibo:editor is used as the inverse of core:editorOf. Public Description for bibo:editor was obtained from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - - - - - - + + - @@ -5295,12 +5250,32 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A postdoctoral training appointment (job) + + + + + + + + 1 + + + + + + + + + + 1 + + @@ -5311,11 +5286,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - @@ -5328,16 +5298,21 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + + + 1 + + + + + + + + - - - 1 - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/es/ @@ -5356,11 +5331,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - @@ -5368,11 +5338,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - @@ -5381,6 +5346,21 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + + + + + + + + + + + The name defining a special edition of a document. Normally its a literal value composed of a version number and words. @@ -5388,6 +5368,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://purl.org/ontology/bibo/ + + + + + FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/zh/ @@ -5401,35 +5386,35 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/termportal/en/ 2010-06-24 - - - + + + - + 1 - + - - + - + + + + + + + - - - 1 - - 2010-04-01 UN Statistics Division http://unstats.un.org/unsd/methods/m49/m49alpha.htm @@ -5440,6 +5425,21 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49alpha.htm + + + + + + + + + + + + + + + paraphrased editorial note from the bibo ontology: We are not defining, using an enumeration, the range of the bibo:status to be a defined list of bibo:DocumentStatus. This is because we want people to be able to define new statuses if needed; and creating such an enumeration would prevent this. @@ -5448,9 +5448,9 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A list of items in a collection; an ordered compilation of item descriptions and sufficient information to afford access to them - + + - NLM Catalog Short Definition is the Medical Subject Heading (MeSH) definition From aa4094f60079053bcc0f8a669afcbd352188eebd Mon Sep 17 00:00:00 2001 From: hlm7 Date: Sun, 23 Jan 2011 00:20:43 +0000 Subject: [PATCH 094/427] Holly did some tweaking to the AddPublications test suite. --- .../suites/AddPublications/AddTestFaculty.html | 2 +- .../suites/AddPublications/ValidateFields.html | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddPublications/AddTestFaculty.html b/utilities/acceptance-tests/suites/AddPublications/AddTestFaculty.html index 2c362176..3e5820ae 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddTestFaculty.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddTestFaculty.html @@ -156,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html index 14945ad1..262f7ed1 100644 --- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html +++ b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html @@ -314,6 +314,11 @@ Verify author info is there + + verifyTextPresent + chapter + + verifyElementPresent link=Nintendo O.K. for Kids @@ -324,11 +329,6 @@ Nintendo O.K. for Kids - - verifyTextPresent - chapter - - comment Add Image, validating field first From 30dce5d9d936318df8ff15032ae8fde3e27a157e Mon Sep 17 00:00:00 2001 From: hlm7 Date: Sun, 23 Jan 2011 02:23:48 +0000 Subject: [PATCH 095/427] Holly did some tweaking to AddRoles and CheckVisualizations test suites. --- .../AddRoles/CreateTestFacultyMember.html | 2 +- .../suites/AddRoles/CreateTestLibrarian.html | 2 +- .../suites/AddRoles/DeleteIndexStuff.html | 194 +++--------------- .../AddRoles/DeleteTestFacultyMember.html | 2 +- .../suites/AddRoles/DeleteTestLibrarian.html | 2 +- .../CheckVisualizations/AddPublications.html | 72 +------ .../CheckVisualizations/AddTestFaculty.html | 12 +- .../CheckVisualizations/DeleteIndexStuff.html | 28 +-- .../CheckVisualizations/DeleteTestCos.html | 6 +- .../DeleteTestFaculty.html | 2 +- 10 files changed, 61 insertions(+), 261 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html index c7ca382c..036d78b1 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html @@ -151,7 +151,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html b/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html index b589f51e..45cf7876 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html +++ b/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html @@ -151,7 +151,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html index 563017e5..8d19dbe8 100644 --- a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html @@ -194,6 +194,11 @@ Department + + verifyTextPresent + Group + + verifyTextPresent Museum @@ -231,7 +236,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -301,7 +306,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -371,7 +376,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -441,7 +446,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -506,7 +511,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -576,7 +581,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -646,7 +651,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -716,7 +721,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -786,7 +791,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -856,7 +861,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -926,7 +931,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -996,7 +1001,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1066,7 +1071,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1136,7 +1141,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1206,77 +1211,7 @@ clickAndWait - link=edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - click - _delete - - - - assertConfirmation - Are you SURE you want to delete this entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Organization - - - - assertTitle - Organization - - - - clickAndWait - link=Librarians for the Better Treatment of Primates - - - - assertTitle - Librarians for the Better Treatment of Primates - - - - clickAndWait - link=edit this individual + link=Edit this individual @@ -1346,7 +1281,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1416,7 +1351,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1466,97 +1401,27 @@ clickAndWait - link=Organization + link=Committee assertTitle - Organization + Committee clickAndWait - link=LITA + link=Librarians for the Better Treatment of Primates assertTitle - LITA + Librarians for the Better Treatment of Primates clickAndWait - link=edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - click - _delete - - - - assertConfirmation - Are you SURE you want to delete this entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Organization - - - - assertTitle - Organization - - - - clickAndWait - link=LITA Too - - - - assertTitle - LITA Too - - - - clickAndWait - link=edit this individual + link=Edit this individual @@ -1769,6 +1634,11 @@ Department + + verifyTextNotPresent + Group + + verifyTextNotPresent Museum diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html index 057425b0..1704d201 100644 --- a/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html @@ -131,7 +131,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html b/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html index bac1a876..c4a9aabe 100644 --- a/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html +++ b/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html @@ -126,7 +126,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html index 9e6ad6d7..97058bb8 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html @@ -266,7 +266,7 @@ assertTitle - exact:Nintendo: Good or Bad for Kids? + Nintendo: Good or Bad for Kids? @@ -274,24 +274,9 @@ //div[@id='wrapper-content']/section[4]/article/h3/a/img - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type - name + dateTimeField.year 2009 @@ -301,7 +286,7 @@ assertTitle - exact:Nintendo: Good or Bad for Kids? + Nintendo: Good or Bad for Kids? @@ -474,24 +459,9 @@ //h3[@id='dateTimeValue']/a/img - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type - name + dateTimeField.year 2001 @@ -659,24 +629,9 @@ //h3[@id='dateTimeValue']/a/img - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type - name + dateTimeField.year 2003 @@ -809,24 +764,9 @@ //h3[@id='dateTimeValue']/a/img - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type - name + dateTimeField.year 2005 diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html index 2ad211a1..8d64f43b 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html @@ -156,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -239,16 +239,6 @@ Furter, Frank - - verifyTextNotPresent - Co-Investigator Network - - - - verifyTextNotPresent - Co-Author Network - - comment Logout diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html index 7a3bc7f1..e9c02dd6 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html @@ -161,7 +161,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -231,7 +231,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -301,7 +301,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -361,17 +361,17 @@ clickAndWait - link=exact:Nix Nintendo? + link=Nix Nintendo? assertTitle - exact:Nix Nintendo? + Nix Nintendo? clickAndWait - link=edit this individual + link=Edit this individual @@ -446,7 +446,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -521,7 +521,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -596,7 +596,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -656,7 +656,7 @@ clickAndWait - link=exact:Nintendo: Good or Bad for Kids? + link=Nintendo: Good or Bad for Kids? @@ -666,7 +666,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -736,7 +736,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -806,7 +806,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -876,7 +876,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html index 78573e01..39366b16 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestCos.html @@ -156,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -231,7 +231,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -306,7 +306,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html index 6595318f..d78df45c 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html @@ -156,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual From 592eccfa69e62c6f332dae4f071601dddac40ecd Mon Sep 17 00:00:00 2001 From: hlm7 Date: Sun, 23 Jan 2011 17:07:33 +0000 Subject: [PATCH 096/427] Holly made changes to vivo-basic test cases to match the changes in the wilma test cases. --- .../AddNonPersonThingsVB/CheckIndexView.html | 10 - .../AddNonPersonThingsVB/CheckPublicView.html | 1044 ++++++++++++++++- .../AddNonPersonThingsVB/CreateActivity.html | 36 +- .../AddNonPersonThingsVB/CreateCourse.html | 43 +- .../AddNonPersonThingsVB/CreateEvent.html | 36 +- .../CreateFacultyMember.html | 2 +- .../AddNonPersonThingsVB/CreateLibrarian.html | 2 +- .../CreateOrganization.html | 24 +- .../DeleteIndexStuff.html | 125 +- .../VerifyAllThingsSearchable.html | 7 +- .../suites/AddPublicationsVB/AddChapter.html | 25 + .../AddPublicationsVB/AddTestFaculty.html | 2 +- .../AddPublicationsVB/ValidateFields.html | 18 +- .../AddRolesVB/CreateTestFacultyMember.html | 2 +- .../AddRolesVB/CreateTestLibrarian.html | 2 +- .../suites/AddRolesVB/DeleteIndexStuff.html | 194 +-- .../AddRolesVB/DeleteTestFacultyMember.html | 2 +- .../AddRolesVB/DeleteTestLibrarian.html | 2 +- .../AddPublications.html | 72 +- .../CheckVisualizationsVB/AddTestFaculty.html | 12 +- .../DeleteIndexStuff.html | 28 +- .../CheckVisualizationsVB/DeleteTestCos.html | 6 +- .../DeleteTestFaculty.html | 2 +- .../suites/CreatePeopleVB/AddFacultyInfo.html | 5 + .../CreatePeopleVB/AddFacultyInfo2.html | 5 + .../CreatePeopleVB/ChangeFacultyImage.html | 2 +- .../CreatePeopleVB/CreateFacultyMember.html | 37 +- .../CreatePeopleVB/CreateLibrarian.html | 37 +- .../CreatePeopleVB/DeleteFacultyImage.html | 5 + .../CreatePeopleVB/DeleteFacultyInfo.html | 577 ++++----- .../CreatePeopleVB/DeleteLibrarianImage.html | 5 + .../CreatePeopleVB/DeleteTestPeople.html | 4 +- .../CreatePeopleVB/EditFacultyInfo.html | 12 +- .../CreatePeopleVB/UploadFacultyImage.html | 4 +- .../CreatePeopleVB/VerifyImageDisplay.html | 45 - .../AddMuseumArchDetails.html | 2 +- .../AddMuseumVisitingHours.html | 2 +- .../AddEducationBackground.html | 12 +- .../ChangeEducationBackground.html | 24 +- .../CheckPublicView.html | 6 +- .../DeleteEducationalBackground.html | 12 +- .../ProcessRDFDataVB/ExportRDFFile.html | 10 +- 42 files changed, 1656 insertions(+), 846 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckIndexView.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckIndexView.html index 6feae912..405423e8 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckIndexView.html @@ -149,11 +149,6 @@ Course (1) - - verifyTextPresent - Academic Term (1) - - verifyTextPresent Conference (1) @@ -284,11 +279,6 @@ link=Course - - verifyElementPresent - link=Academic Term - - verifyElementPresent link=Conference diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckPublicView.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckPublicView.html index 3b47e613..b3708ea1 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckPublicView.html @@ -94,11 +94,46 @@ Faculty, Jane + + verifyTextPresent + Positions + + verifyTextPresent Primate College of America, Dr. 1999 - + + verifyElementPresent + link=Primate College of America + + + + verifyTextPresent + Research Areas + + + + verifyElementPresent + link=Primate Health + + + + verifyTextPresent + Service + + + + verifyTextPresent + organizer of + + + + verifyElementPresent + link=Introduction to Primate Health + + verifyTextPresent Introduction to Primate Health Course @@ -144,11 +179,26 @@ Librarian, Lily + + verifyTextPresent + Service + + + + verifyTextPresent + organizer of + + verifyTextPresent Primate Health Conference Conference + + verifyElementPresent + link=Primate Health Conference + + comment Go back to Index @@ -189,6 +239,21 @@ Primate Heart Health Clinic + + verifyTextPresent + related role + + + + verifyTextPresent + clinical role + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America Founder 2010 - @@ -229,31 +294,81 @@ Introduction to Primate Health + + verifyTextPresent + offered by + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America College + + verifyTextPresent + description + + verifyTextPresent Learn the basics about the general health of primates. + + verifyTextPresent + organized by + + + + verifyElementPresent + link=Faculty, Jane + + verifyTextPresent Faculty, Jane Assistant Professor + + verifyTextPresent + prerequisite for + + + + verifyElementPresent + link=Introduction to Primate Health + + verifyTextPresent Introduction to Primate Health Course + + verifyTextPresent + contact information + + verifyTextPresent ME Tarzan at metarzan@primates.edu or 555-555-5553 + + verifyTextPresent + geographic focus + + + + verifyElementPresent + link=Africa + + verifyTextPresent Africa geographical_region @@ -261,7 +376,37 @@ verifyTextPresent - Liberia + has geographic location + + + + verifyElementPresent + link=Liberia + + + + verifyTextPresent + Liberia self_governing + + + + verifyTextPresent + date/time interval + + + + verifyTextPresent + September 1, 2007 - December 15, 2007 + + + + verifyTextPresent + related documents + + + + verifyElementPresent + link=http://primatehealthintro.cornell.edu @@ -269,11 +414,41 @@ http://primatehealthintro.cornell.edu Webpage + + verifyTextPresent + has prerequisite + + + + verifyElementPresent + link=Introduction to Primate Health + + verifyTextPresent Introduction to Primate Health Course + + verifyTextPresent + subject area + + + + verifyElementPresent + link=Primate Health + + + + verifyTextPresent + Primate Health Subject Area + + + + verifyElementPresent + link=Animal Health + + verifyTextPresent Animal Health Subject Area @@ -281,7 +456,12 @@ verifyTextPresent - Primate Health Subject Area + includes event + + + + verifyElementPresent + link=Primate Health Check @@ -291,12 +471,12 @@ verifyTextPresent - 9 + credits verifyTextPresent - Fall Semester 2007 | Academic Term + 9 @@ -319,41 +499,6 @@ Verify Events - - clickAndWait - link=Academic Term - - - - assertTitle - Academic Term - - - - clickAndWait - link=Fall Semester 2007 - - - - assertTitle - Fall Semester 2007 - - - - verifyTextPresent - Introduction to Primate Health Course - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - clickAndWait link=Conference @@ -374,21 +519,51 @@ Primate Health Conference + + verifyTextPresent + description + + verifyTextPresent First annual conference for those interested in the general health of primates. + + verifyTextPresent + proceedings + + + + verifyElementPresent + link=PHC Proceedings + + verifyTextPresent PHC Proceedings Proceedings + + verifyTextPresent + organized by + + + + verifyElementPresent + link=Librarian, Lily + + verifyTextPresent Librarian, Lily Assistant Librarian + + verifyTextPresent + contact information + + verifyTextPresent info@primateconf.org @@ -396,17 +571,52 @@ verifyTextPresent - Kenya + geographic focus + + + + verifyElementPresent + link=Kenya verifyTextPresent - the Congo + Kenya self_governing verifyTextPresent - 2011-01-05 to 2011-01-09 + has geographic location + + + + verifyElementPresent + link=the Congo + + + + verifyTextPresent + the Congo self_governing + + + + verifyTextPresent + date/time interval + + + + verifyTextPresent + January 5, 2011 - January 9, 2011 + + + + verifyTextPresent + related documents + + + + verifyElementPresent + link=http://primatehealthintro.cornell.edu @@ -414,16 +624,41 @@ http://primatehealthintro.cornell.edu Webpage + + verifyTextPresent + subject area + + + + verifyElementPresent + link=Animal Health + + verifyTextPresent Animal Health Subject Area + + verifyTextPresent + includes event + + + + verifyElementPresent + link=Primate Health Check + + verifyTextPresent Primate Health Check Event + + verifyTextPresent + abbreviation + + verifyTextPresent PrimHConf @@ -459,6 +694,21 @@ Primate Health and Fitness + + verifyTextPresent + related role + + + + verifyTextPresent + presenter role + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America Organizer 2008 @@ -546,7 +796,12 @@ verifyTextPresent - Primate College of America College + predecessor organization + + + + verifyElementPresent + link=Primate College of America @@ -554,6 +809,31 @@ Primate College of America College + + verifyTextPresent + successor organization + + + + verifyElementPresent + link=Primate College of America + + + + verifyTextPresent + Primate College of America College + + + + verifyTextPresent + offers degree + + + + verifyElementPresent + link=B.S. Bachelor of Science + + verifyTextPresent B.S. Bachelor of Science Academic Degree @@ -561,7 +841,12 @@ verifyTextPresent - Primate Habitat Research Grant Grant + awards grant + + + + verifyElementPresent + link=Primate Habitat Research Grant @@ -569,61 +854,181 @@ Primate Habitat Research Grant Grant + + verifyTextPresent + subcontracts grant + + + + verifyElementPresent + link=Primate Survival Planning Grant + + verifyTextPresent Primate Survival Planning Grant Grant + + verifyTextPresent + sponsors award or honor + + + + verifyElementPresent + link=Primate Student of the Year + + verifyTextPresent Primate Student of the Year Award or Honor + + verifyTextPresent + award or honor given + + + + verifyElementPresent + link=Best Primate College + + verifyTextPresent Best Primate College Award or Honor Receipt + + verifyTextPresent + has equipment + + + + verifyElementPresent + link=Portable Primate Habitat + + verifyTextPresent Portable Primate Habitat Equipment + + verifyTextPresent + has sub-organization + + + + verifyElementPresent + link=Primate Research Laboratory + + verifyTextPresent Primate Research Laboratory Laboratory + + verifyTextPresent + organization within + + + + verifyElementPresent + link=Primate History Library + + verifyTextPresent Primate History Library Library + + verifyTextPresent + people + + + + verifyElementPresent + link=Faculty, Jane + + verifyTextPresent Faculty, Jane, Dr. 1999 - + + verifyTextPresent + head of + + + + verifyElementPresent + link=Primates-r-us + + verifyTextPresent Primates-r-us Founder 2010 - + + verifyTextPresent + affliliated organization + + + + verifyElementPresent + link=Primates-r-us + + verifyTextPresent Primates-r-us Organization + + verifyTextPresent + member of + + + + verifyElementPresent + link=Primate Colleges of the World + + verifyTextPresent Primate Colleges of the World Member 2009 - + + verifyTextPresent + collaborator + + + + verifyElementPresent + link=Primate History Library + + verifyTextPresent Primate History Library Library + + verifyTextPresent + clinical activities + + + + verifyElementPresent + link=Primate Heart Health Clinic + + verifyTextPresent Primate Heart Health Clinic Founder 2010 - @@ -631,7 +1036,27 @@ verifyTextPresent - Primate Info + selected publications + + + + verifyTextPresent + database + + + + verifyElementPresent + link=Primate Info + + + + verifyTextPresent + presentations + + + + verifyElementPresent + link=Primate Health and Fitness @@ -639,46 +1064,121 @@ Primate Health and Fitness Organizer 2008 + + verifyTextPresent + outreach and community service + + + + verifyElementPresent + link=Primate Health Check + + verifyTextPresent Primate Health Check Sponsor 2008 - 2010 + + verifyTextPresent + has geographic location + + + + verifyElementPresent + link=northern Africa + + verifyTextPresent northern Africa geographical_region + + verifyTextPresent + email + + verifyTextPresent info@primates.edu + + verifyTextPresent + phone + + verifyTextPresent 555-555-5555 + + verifyTextPresent + fax + + verifyTextPresent 555-555-5554 + + verifyTextPresent + mailing address + + + + verifyElementPresent + link=1234 Northern African Nation + + verifyTextPresent 1234 Northern African Nation Address + + verifyTextPresent + date/time interval + + + + verifyTextPresent + 1959 - + + + + verifyTextPresent + offers course + + + + verifyElementPresent + link=Introduction to Primate Health + + verifyTextPresent Introduction to Primate Health Course + + verifyTextPresent + abbreviation + + verifyTextPresent PCoA + + verifyTextPresent + keywords + + verifyTextPresent Gorillas @@ -714,16 +1214,51 @@ Primate Colleges of the World + + verifyTextPresent + administers grant + + + + verifyElementPresent + link=Primate Elderly Care + + verifyTextPresent Primate Elderly Care Grant + + verifyTextPresent + related role + + + + verifyTextPresent + member role + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America Member 2009 - + + verifyTextPresent + subcontracts grant + + + + verifyElementPresent + link=Primate Elderly Care + + verifyTextPresent Primate Elderly Care Grant @@ -759,6 +1294,21 @@ Primate History Library + + verifyTextPresent + Affiliation + + + + verifyTextPresent + has sub-organization + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America College @@ -794,21 +1344,61 @@ Primate Research Laboratory + + verifyTextPresent + awards grant + + + + verifyElementPresent + link=Primate Elderly Care + + verifyTextPresent Primate Elderly Care Grant + + verifyTextPresent + has equipment + + + + verifyElementPresent + link=Primate Feeder + + verifyTextPresent Primate Feeder Equipment + + verifyTextPresent + has facility + + + + verifyElementPresent + link=Jane Memorial Building + + verifyTextPresent Jane Memorial Building Building + + verifyTextPresent + organization within + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America College @@ -844,6 +1434,21 @@ Primates-r-us + + verifyTextPresent + related role + + + + verifyTextPresent + leader role + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America Founder 2010 - @@ -889,11 +1494,31 @@ Portable Primate Habitat + + verifyTextPresent + equipment for + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America College + + verifyTextPresent + in facility + + + + verifyElementPresent + link=Jane Memorial Building + + verifyTextPresent Jane Memorial Building Building @@ -929,21 +1554,56 @@ Primate Feeder + + verifyTextPresent + equipment for + + + + verifyElementPresent + link=Primate Research Laboratory + + verifyTextPresent Primate Research Laboratory Laboratory + + verifyTextPresent + in facility + + + + verifyElementPresent + link=Primate Research Lab Room 123 + + verifyTextPresent Primate Research Lab Room 123 Facility + + verifyTextPresent + subject area + + + + verifyElementPresent + link=Primate Diet + + verifyTextPresent Primate Diet Subject Area + + verifyTextPresent + keywords + + verifyTextPresent Animal Diet @@ -989,56 +1649,151 @@ Primate Elderly Care + + verifyTextPresent + administered by + + + + verifyElementPresent + link=Primate Colleges of the World + + verifyTextPresent Primate Colleges of the World Consortium + + verifyTextPresent + grant awarded by + + + + verifyElementPresent + link=Primate Research Laboratory + + verifyTextPresent Primate Research Laboratory Laboratory + + verifyTextPresent + abstract + + verifyTextPresent Purpose of grant is to determine the appropriate environment, physical activity, and diet for primates as they age. + + verifyTextPresent + subcontracted through + + + + verifyElementPresent + link=Primate Colleges of the World + + verifyTextPresent Primate Colleges of the World Consortium + + verifyTextPresent + total award amount + + verifyTextPresent $1,234,567 + + verifyTextPresent + direct costs + + verifyTextPresent $999,999 + + verifyTextPresent + sponsor award id + + verifyTextPresent 1234-5678 + + verifyTextPresent + geographic focus + + + + verifyElementPresent + link=Africa + + verifyTextPresent Africa geographical_region + + verifyTextPresent + date/time interval + + + + verifyTextPresent + September 1, 2010 - August 31, 2012 + + + + verifyTextPresent + local award id + + verifyTextPresent P999-1234 + + verifyTextPresent + funding vehicle for + + + + verifyElementPresent + link=Primate Student of the Year + + verifyTextPresent Primate Student of the Year Award or Honor + + verifyTextPresent + subject area + + + + verifyElementPresent + link=Elderly Care + + verifyTextPresent Elderly Care Subject Area @@ -1074,6 +1829,16 @@ Primate Habitat Research Grant + + verifyTextPresent + grant awarded by + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America College @@ -1109,6 +1874,16 @@ Primate Survival Planning Grant + + verifyTextPresent + subcontracted through + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America College @@ -1144,11 +1919,31 @@ Elderly Care + + verifyTextPresent + subject area for + + + + verifyElementPresent + link=Primate Elderly Care + + verifyTextPresent Primate Elderly Care Grant + + verifyTextPresent + related + + + + verifyElementPresent + link=Primate Health + + verifyTextPresent Primate Health Subject Area @@ -1184,11 +1979,31 @@ Primate Diet + + verifyTextPresent + broader term + + + + verifyElementPresent + link=Primate Health + + verifyTextPresent Primate Health Subject Area + + verifyTextPresent + subject area for + + + + verifyElementPresent + link=Primate Feeder + + verifyTextPresent Primate Feeder Equipment @@ -1224,31 +2039,91 @@ Primate Health + + verifyTextPresent + broader term + + + + verifyElementPresent + link=Animal Health + + verifyTextPresent Animal Health Subject Area + + verifyTextPresent + research area of + + + + verifyElementPresent + link=Faculty, Jane + + verifyTextPresent Faculty, Jane Assistant Professor + + verifyTextPresent + source vocabulary reference + + + + verifyElementPresent + link=Not sure + + verifyTextPresent Not sure Vocabulary Source Reference + + verifyTextPresent + subject area for + + + + verifyElementPresent + link=Introduction to Primate Health + + verifyTextPresent Introduction to Primate Health Course + + verifyTextPresent + narrower term + + + + verifyElementPresent + link=Primate Diet + + verifyTextPresent Primate Diet Subject Area + + verifyTextPresent + related to + + + + verifyElementPresent + link=Elderly Care + + verifyTextPresent Elderly Care Subject Area @@ -1276,12 +2151,22 @@ clickAndWait - link=exact:http://primatehealthintro.cornell.edu + link=http://primatehealthintro.cornell.edu assertTitle - exact:http://primatehealthintro.cornell.edu + http://primatehealthintro.cornell.edu + + + + verifyTextPresent + presented at + + + + verifyElementPresent + link=Primate Health Conference @@ -1289,6 +2174,11 @@ Primate Health Conference Conference + + verifyElementPresent + link=Introduction to Primate Health + + verifyTextPresent Introduction to Primate Health Course @@ -1334,26 +2224,76 @@ Jane Memorial Building + + verifyTextPresent + facility for + + + + verifyElementPresent + link=Primate Research Laboratory + + verifyTextPresent Primate Research Laboratory Laboratory + + verifyTextPresent + rooms + + + + verifyElementPresent + link=Lab Admin Office + + verifyTextPresent Lab Admin Office Room + + verifyTextPresent + geographically contains + + + + verifyElementPresent + link=Primate Research Laboratory + + verifyTextPresent Primate Research Laboratory Campus + + verifyTextPresent + location of equipment + + + + verifyElementPresent + link=Portable Primate Habitat + + verifyTextPresent Portable Primate Habitat Equipment + + verifyTextPresent + geographic location of + + + + verifyElementPresent + link=Primate Research Lab Room 123 + + verifyTextPresent Primate Research Lab Room 123 Facility @@ -1389,6 +2329,16 @@ Lab Admin Office + + verifyTextPresent + room within building + + + + verifyElementPresent + link=Jane Memorial Building + + verifyTextPresent Jane Memorial Building Building diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html index 101c7675..f7a9a0d7 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html @@ -444,25 +444,35 @@ Edit + + type + startField.year + 2010 + select - typeOfNew - label=Date/Time Interval (core) + startField.month + label=9 - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - + select + startField.day + label=1 type - name - 2010-09-01 to 2012-08-31 + endField.year + 2012 + + + select + endField.month + label=8 + + + select + endField.day + label=31 clickAndWait @@ -631,7 +641,7 @@ verifyTextPresent - 2010-09-01 to 2012-08-31 + September 1, 2010 - August 31, 2012 diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html index 6f55b8cb..a04f4093 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html @@ -416,23 +416,38 @@ verifyTextPresent - Select an existing Date/Time Interval for Introduction to Primate Health - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit + Create date time interval for Introduction to Primate Health type - name - Fall Semester 2007 + startField.year + 2007 + + + select + startField.month + label=9 + + + select + startField.day + label=1 + + + type + endField.year + 2007 + + + select + endField.month + label=12 + + + select + endField.day + label=15 clickAndWait @@ -636,7 +651,7 @@ verifyTextPresent - Fall Semester 2007 + September 1, 2007 - December 15, 2007 diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html index 77630766..5dd4fe75 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html @@ -434,25 +434,35 @@ Edit + + type + startField.year + 2011 + select - typeOfNew - label=Date/Time Interval (core) + startField.month + label=1 - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - + select + startField.day + label=5 type - name - 2011-01-05 to 2011-01-09 + endField.year + 2011 + + + select + endField.month + label=1 + + + select + endField.day + label=9 clickAndWait @@ -616,7 +626,7 @@ verifyTextPresent - 2011-01-05 to 2011-01-09 + January 5, 2011 - January 9, 2011 diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateFacultyMember.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateFacultyMember.html index 6b4207c4..125482c5 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateFacultyMember.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateFacultyMember.html @@ -146,7 +146,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLibrarian.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLibrarian.html index 8b62cf7a..43d5e847 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLibrarian.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLibrarian.html @@ -151,7 +151,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html index c92f89d2..a3c9b5e1 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html @@ -466,7 +466,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img + //h3[@id='hasSubOrganization']/a/img @@ -1039,24 +1039,9 @@ Edit - - select - typeOfNew - label=Date/Time Interval (core) - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type - name + startField.year 1959 @@ -1069,6 +1054,11 @@ Primate College of America + + assertTitle + Primate College of America + + comment Test other entry diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html index ac0c6a39..f10c38e3 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html @@ -149,6 +149,11 @@ equipment + + verifyTextPresent + Academic Term (1) + + verifyTextPresent research @@ -186,7 +191,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -256,7 +261,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -331,7 +336,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -401,7 +406,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -471,7 +476,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -541,7 +546,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -616,7 +621,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -669,76 +674,6 @@ Delete Events - - clickAndWait - link=Academic Term - - - - assertTitle - Academic Term - - - - clickAndWait - link=Fall Semester 2007 - - - - assertTitle - Fall Semester 2007 - - - - clickAndWait - link=edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - click - _delete - - - - assertConfirmation - Are you SURE you want to delete this entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - clickAndWait link=Conference @@ -761,7 +696,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -831,7 +766,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -906,7 +841,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -976,7 +911,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1046,7 +981,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1116,7 +1051,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1181,7 +1116,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1256,7 +1191,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1326,7 +1261,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1401,7 +1336,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1466,7 +1401,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1531,7 +1466,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1601,7 +1536,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1671,7 +1606,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1741,7 +1676,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1811,7 +1746,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1886,7 +1821,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1956,7 +1891,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/VerifyAllThingsSearchable.html index cf5a22cf..78d8f556 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/VerifyAllThingsSearchable.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/VerifyAllThingsSearchable.html @@ -141,7 +141,7 @@ verifyTextPresent - Primate Info | Database + Primate Info | Database @@ -279,11 +279,6 @@ 1234 Northern African Nation | Address - - verifyTextPresent - Fall Semester 2007 | Academic Term - - verifyTextPresent Librarian, Lily | Assistant Librarian diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html index 8b5ce0ea..df2dd51d 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html @@ -319,6 +319,31 @@ Nintendo O.K. for Kids + + clickAndWait + //h3[@id='chapter']/a/img + + + + assertTitle + Edit + + + + type + tinymce + 13 + + + clickAndWait + submit + + + + assertTitle + Nintendo O.K. for Kids + + clickAndWait //div[@id='wrapper-content']/section[7]/article[7]/h3/a/img diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFaculty.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFaculty.html index 2c362176..3e5820ae 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFaculty.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFaculty.html @@ -156,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html index f3f29848..262f7ed1 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html @@ -314,6 +314,11 @@ Verify author info is there + + verifyTextPresent + chapter + + verifyElementPresent link=Nintendo O.K. for Kids @@ -324,11 +329,6 @@ Nintendo O.K. for Kids - - verifyTextPresent - chapter - - comment Add Image, validating field first @@ -971,7 +971,7 @@ clickAndWait - //div[@id='chapter']/a + //h3[@id='chapter']/a/img @@ -1001,7 +1001,7 @@ clickAndWait - //div[@id='chapter']/a + //h3[@id='chapter']/a/img @@ -2456,7 +2456,7 @@ verifyTextPresent - Marcel Decker Publisher + Marcel Decker Publisher @@ -2476,7 +2476,7 @@ verifyTextPresent - Raising Children in the 21st Century Collection + Raising Children in the 21st Century Collection diff --git a/utilities/acceptance-tests/suites/AddRolesVB/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/AddRolesVB/CreateTestFacultyMember.html index c7ca382c..036d78b1 100644 --- a/utilities/acceptance-tests/suites/AddRolesVB/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/AddRolesVB/CreateTestFacultyMember.html @@ -151,7 +151,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddRolesVB/CreateTestLibrarian.html b/utilities/acceptance-tests/suites/AddRolesVB/CreateTestLibrarian.html index b589f51e..45cf7876 100644 --- a/utilities/acceptance-tests/suites/AddRolesVB/CreateTestLibrarian.html +++ b/utilities/acceptance-tests/suites/AddRolesVB/CreateTestLibrarian.html @@ -151,7 +151,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddRolesVB/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddRolesVB/DeleteIndexStuff.html index 563017e5..8d19dbe8 100644 --- a/utilities/acceptance-tests/suites/AddRolesVB/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddRolesVB/DeleteIndexStuff.html @@ -194,6 +194,11 @@ Department + + verifyTextPresent + Group + + verifyTextPresent Museum @@ -231,7 +236,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -301,7 +306,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -371,7 +376,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -441,7 +446,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -506,7 +511,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -576,7 +581,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -646,7 +651,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -716,7 +721,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -786,7 +791,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -856,7 +861,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -926,7 +931,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -996,7 +1001,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1066,7 +1071,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1136,7 +1141,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1206,77 +1211,7 @@ clickAndWait - link=edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - click - _delete - - - - assertConfirmation - Are you SURE you want to delete this entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Organization - - - - assertTitle - Organization - - - - clickAndWait - link=Librarians for the Better Treatment of Primates - - - - assertTitle - Librarians for the Better Treatment of Primates - - - - clickAndWait - link=edit this individual + link=Edit this individual @@ -1346,7 +1281,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1416,7 +1351,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -1466,97 +1401,27 @@ clickAndWait - link=Organization + link=Committee assertTitle - Organization + Committee clickAndWait - link=LITA + link=Librarians for the Better Treatment of Primates assertTitle - LITA + Librarians for the Better Treatment of Primates clickAndWait - link=edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value='Edit This Individual'] - - - - assertTitle - Individual Editing Form - - - - click - _delete - - - - assertConfirmation - Are you SURE you want to delete this entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Organization - - - - assertTitle - Organization - - - - clickAndWait - link=LITA Too - - - - assertTitle - LITA Too - - - - clickAndWait - link=edit this individual + link=Edit this individual @@ -1769,6 +1634,11 @@ Department + + verifyTextNotPresent + Group + + verifyTextNotPresent Museum diff --git a/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestFacultyMember.html index 057425b0..1704d201 100644 --- a/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestFacultyMember.html @@ -131,7 +131,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestLibrarian.html b/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestLibrarian.html index bac1a876..c4a9aabe 100644 --- a/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestLibrarian.html +++ b/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestLibrarian.html @@ -126,7 +126,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddPublications.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddPublications.html index 9e6ad6d7..97058bb8 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddPublications.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddPublications.html @@ -266,7 +266,7 @@ assertTitle - exact:Nintendo: Good or Bad for Kids? + Nintendo: Good or Bad for Kids? @@ -274,24 +274,9 @@ //div[@id='wrapper-content']/section[4]/article/h3/a/img - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type - name + dateTimeField.year 2009 @@ -301,7 +286,7 @@ assertTitle - exact:Nintendo: Good or Bad for Kids? + Nintendo: Good or Bad for Kids? @@ -474,24 +459,9 @@ //h3[@id='dateTimeValue']/a/img - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type - name + dateTimeField.year 2001 @@ -659,24 +629,9 @@ //h3[@id='dateTimeValue']/a/img - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type - name + dateTimeField.year 2003 @@ -809,24 +764,9 @@ //h3[@id='dateTimeValue']/a/img - - assertTitle - Edit - - - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type - name + dateTimeField.year 2005 diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddTestFaculty.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddTestFaculty.html index 2ad211a1..8d64f43b 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddTestFaculty.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddTestFaculty.html @@ -156,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -239,16 +239,6 @@ Furter, Frank - - verifyTextNotPresent - Co-Investigator Network - - - - verifyTextNotPresent - Co-Author Network - - comment Logout diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteIndexStuff.html index 7a3bc7f1..e9c02dd6 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteIndexStuff.html @@ -161,7 +161,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -231,7 +231,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -301,7 +301,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -361,17 +361,17 @@ clickAndWait - link=exact:Nix Nintendo? + link=Nix Nintendo? assertTitle - exact:Nix Nintendo? + Nix Nintendo? clickAndWait - link=edit this individual + link=Edit this individual @@ -446,7 +446,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -521,7 +521,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -596,7 +596,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -656,7 +656,7 @@ clickAndWait - link=exact:Nintendo: Good or Bad for Kids? + link=Nintendo: Good or Bad for Kids? @@ -666,7 +666,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -736,7 +736,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -806,7 +806,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -876,7 +876,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteTestCos.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteTestCos.html index 78573e01..39366b16 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteTestCos.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteTestCos.html @@ -156,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -231,7 +231,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -306,7 +306,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteTestFaculty.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteTestFaculty.html index 6595318f..d78df45c 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteTestFaculty.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteTestFaculty.html @@ -156,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html index 5f32a0cb..ce44d4f3 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html @@ -34,6 +34,11 @@ + + setTimeout + 200000 + + comment Add all available fields that aren't tested elsewhere diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html index d763b1a1..016d414a 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html @@ -34,6 +34,11 @@ + + setTimeout + 200000 + + comment Add a second value for fields entered via AddFacultyInfo diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html index fef145d8..49e471c0 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html @@ -141,7 +141,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/CreateFacultyMember.html b/utilities/acceptance-tests/suites/CreatePeopleVB/CreateFacultyMember.html index 74868d36..79a7ca06 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/CreateFacultyMember.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/CreateFacultyMember.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Add a Faculty member named Jane Faculty @@ -236,7 +241,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -269,6 +274,36 @@ Individual Control Panel + + pause + 50000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + comment Verify that Jane Faculty was created diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/CreateLibrarian.html b/utilities/acceptance-tests/suites/CreatePeopleVB/CreateLibrarian.html index 0e8e5be5..81a26787 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/CreateLibrarian.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/CreateLibrarian.html @@ -34,6 +34,11 @@ + + setTimeout + 100000 + + comment Create Librarian person @@ -151,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -184,6 +189,36 @@ Individual Control Panel + + pause + 50000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + comment Verify that librarian was added sucessfully diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyImage.html index b8aca301..c2a40b4f 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyImage.html @@ -144,6 +144,11 @@ //img[@alt='delete'] + + assertConfirmation + Are you sure you want to delete this photo? + + refreshAndWait 10000 diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html index fb6a499f..a99584fb 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html @@ -34,6 +34,11 @@ + + setTimeout + 200000 + + comment Delete all fields added by *FacultyInfo test casesd @@ -131,7 +136,27 @@ comment - Delete it all + Delete top info + + + + clickAndWait + //section[@id='individual-info']/p/a[2]/img + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane @@ -155,15 +180,10 @@ - click + clickAndWait //img[@alt='delete'] - - assertConfirmation - Are you sure you want to delete your photo? - - assertTitle Edit @@ -180,15 +200,10 @@ - click + clickAndWait //img[@alt='delete'] - - assertConfirmation - Are you sure you want to delete your photo? - - assertTitle Edit @@ -205,15 +220,10 @@ - click + clickAndWait //img[@alt='delete'] - - assertConfirmation - Are you sure you want to delete your photo? - - assertTitle Edit @@ -230,15 +240,10 @@ - click + clickAndWait //img[@alt='delete'] - - assertConfirmation - Are you sure you want to delete your photo? - - assertTitle Edit @@ -255,15 +260,10 @@ - click + clickAndWait //img[@alt='delete'] - - assertConfirmation - Are you sure you want to delete your photo? - - assertTitle Edit @@ -280,15 +280,10 @@ - click + clickAndWait //img[@alt='delete'] - - assertConfirmation - Are you sure you want to delete your photo? - - assertTitle Edit @@ -304,6 +299,276 @@ Faculty, Jane + + comment + Delete Affiliation info + + + + clickAndWait + //img[@alt='delete'] + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + //img[@alt='delete'] + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + comment + Delete Research info + + + + clickAndWait + //img[@alt='delete'] + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + //img[@alt='delete'] + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + //img[@alt='delete'] + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + comment + Delete Teaching info + + + + clickAndWait + //img[@alt='delete'] + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + //img[@alt='delete'] + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + //img[@alt='delete'] + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + comment + Delete Service info + + + + clickAndWait + //img[@alt='delete'] + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + comment + Delete Background info + + + + clickAndWait + //img[@alt='delete'] + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + //img[@alt='delete'] + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + //img[@alt='delete'] + + + + assertTitle + Edit + + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + comment + Delete Contact info + + clickAndWait //img[@alt='delete'] @@ -485,123 +750,8 @@ - clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane + comment + Delete Identity info @@ -725,123 +875,8 @@ - clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane + comment + Delete Other info diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibrarianImage.html index ad73eeac..912509ed 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibrarianImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibrarianImage.html @@ -129,6 +129,11 @@ //img[@alt='delete'] + + assertConfirmation + Are you sure you want to delete this photo? + + refreshAndWait 10000 diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html index 94a0d273..1e5749d2 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html @@ -126,7 +126,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -196,7 +196,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html index 353ac648..95a5c86f 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html @@ -34,6 +34,11 @@ + + setTimeout + 200000 + + comment Edit all available fields that aren't tested elsewhere @@ -534,9 +539,14 @@ Faculty, Jane + + chooseCancelOnNextConfirmation + + + clickAndWait - //section[@id='share-contact']/h3[2]/a/img + //img[@alt='edit'] diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadFacultyImage.html index 557a546c..a9ae666a 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadFacultyImage.html @@ -151,7 +151,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -361,7 +361,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/VerifyImageDisplay.html b/utilities/acceptance-tests/suites/CreatePeopleVB/VerifyImageDisplay.html index 63289a1c..0b8e9d7f 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/VerifyImageDisplay.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/VerifyImageDisplay.html @@ -89,51 +89,6 @@ //img[@title='no image'] - - comment - Navigate to a non-person - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Country - - - - assertTitle - Country - - - - clickAndWait - link=Afghanistan - - - - assertTitle - Afghanistan - - - - comment - Verify no image displays - - - - verifyElementNotPresent - //img[@title='no image'] - - comment Navigate to Jane Faculty diff --git a/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumArchDetails.html b/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumArchDetails.html index 9cd5abfe..2fe74b7d 100644 --- a/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumArchDetails.html +++ b/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumArchDetails.html @@ -166,7 +166,7 @@ clickAndWait - //h3[@id='architecturalDetails']/a/img + //div[@id='wrapper-content']/section[3]/article[1]/h3/a/img diff --git a/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html b/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html index e24a4966..622de508 100644 --- a/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html @@ -146,7 +146,7 @@ clickAndWait - //h3[@id='visitingHours']/a/img + //div[@id='wrapper-content']/section[3]/article/h3/a/img diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html index 3c9613a8..e721083d 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html @@ -346,7 +346,7 @@ verifyTextPresent - B.S.in Business Administration, Carroll College 1980 + B.S. in Business Administration, Carroll College 1980 @@ -446,7 +446,7 @@ verifyTextPresent - B.S.in Business Administration, Carroll College 1980 + B.S. in Business Administration, Carroll College 1980 @@ -456,7 +456,7 @@ verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Department 1998 - 2000 @@ -556,7 +556,7 @@ verifyTextPresent - B.S.in Business Administration, Carroll College 1980 + B.S. in Business Administration, Carroll College 1980 @@ -566,7 +566,7 @@ verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Department 1998 - 2000 @@ -576,7 +576,7 @@ verifyTextPresent - M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html index 87c65ddc..264d3d51 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html @@ -136,17 +136,17 @@ verifyTextPresent - B.S.in Business Administration, Carroll College 1980 + B.S. in Business Administration, Carroll College 1980 verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Department 1998 - 2000 verifyTextPresent - M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - @@ -226,17 +226,17 @@ verifyTextPresent - B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 + B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Department 1998 - 2000 verifyTextPresent - M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - @@ -301,17 +301,17 @@ verifyTextPresent - B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 + B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Administration Department 1998 - 2000 verifyTextPresent - M.Ed.in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, Graduate School Fellowship 2002 - @@ -381,17 +381,17 @@ verifyTextPresent - B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 + B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Administration Department 1998 - 2000 verifyTextPresent - M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/CheckPublicView.html index e9b00386..7131bb65 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/CheckPublicView.html @@ -106,17 +106,17 @@ verifyTextPresent - M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Administration Department 1998 - 2000 verifyTextPresent - B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 + B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html index be3acfd6..1bb15029 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html @@ -136,17 +136,17 @@ verifyTextPresent - M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - verifyTextPresent - M.B.A.in Business Administration, Carroll University, Business Administration Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Administration Department 1998 - 2000 verifyTextPresent - B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 + B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 @@ -221,17 +221,17 @@ verifyTextNotPresent - M.Ed.in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - + M.Ed. in Business Education, University of Wisconsin, School of Business, Graduate School Fellowship 2002 - verifyTextNotPresent - M.B.A.in Business Administration, Carroll University, Business Department 1998 - 2000 + M.B.A. in Business Administration, Carroll University, Business Department 1998 - 2000 verifyTextNotPresent - B.S.in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 + B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981 diff --git a/utilities/acceptance-tests/suites/ProcessRDFDataVB/ExportRDFFile.html b/utilities/acceptance-tests/suites/ProcessRDFDataVB/ExportRDFFile.html index b84ca911..c8209482 100644 --- a/utilities/acceptance-tests/suites/ProcessRDFDataVB/ExportRDFFile.html +++ b/utilities/acceptance-tests/suites/ProcessRDFDataVB/ExportRDFFile.html @@ -39,11 +39,6 @@ - - setTimeout - 200000 - - open /vivo/ @@ -174,6 +169,11 @@ VIVO + + clickAndWait + link=Log out + + From bead31a9db5bda1f5ef1ab06990ae702046af120 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Sun, 23 Jan 2011 17:38:52 +0000 Subject: [PATCH 097/427] Holly made changes due to differences between the wilma and vivo-basic themes. --- .../CreatePeopleVB/CreateFacultyMember.html | 25 ------------------- .../CreatePeopleVB/CreateLibrarian.html | 25 ------------------- .../suites/CreateProperties/DeleteMuseum.html | 2 +- .../AddMuseumArchDetails.html | 2 +- .../AddMuseumVisitingHours.html | 7 +++++- .../CreatePropertiesVB/DeleteMuseum.html | 2 +- 6 files changed, 9 insertions(+), 54 deletions(-) diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/CreateFacultyMember.html b/utilities/acceptance-tests/suites/CreatePeopleVB/CreateFacultyMember.html index 79a7ca06..fd56e564 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/CreateFacultyMember.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/CreateFacultyMember.html @@ -276,31 +276,6 @@ pause - 50000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait 10000 diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/CreateLibrarian.html b/utilities/acceptance-tests/suites/CreatePeopleVB/CreateLibrarian.html index 81a26787..f74bc1ab 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/CreateLibrarian.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/CreateLibrarian.html @@ -191,31 +191,6 @@ pause - 50000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait 10000 diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html b/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html index 2aea4ad3..d7856c53 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteMuseum.html @@ -141,7 +141,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumArchDetails.html b/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumArchDetails.html index 2fe74b7d..9cd5abfe 100644 --- a/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumArchDetails.html +++ b/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumArchDetails.html @@ -166,7 +166,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[1]/h3/a/img + //h3[@id='architecturalDetails']/a/img diff --git a/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html b/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html index 622de508..78313628 100644 --- a/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreatePropertiesVB/AddMuseumVisitingHours.html @@ -146,7 +146,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article/h3/a/img + //h3[@id='visitingHours']/a/img @@ -164,6 +164,11 @@ submit + + assertTitle + Edit + + type name diff --git a/utilities/acceptance-tests/suites/CreatePropertiesVB/DeleteMuseum.html b/utilities/acceptance-tests/suites/CreatePropertiesVB/DeleteMuseum.html index 2aea4ad3..d7856c53 100644 --- a/utilities/acceptance-tests/suites/CreatePropertiesVB/DeleteMuseum.html +++ b/utilities/acceptance-tests/suites/CreatePropertiesVB/DeleteMuseum.html @@ -141,7 +141,7 @@ clickAndWait - link=edit this individual + link=Edit this individual From a2b1833ebb64084b17086721b0e2e06f39fe2576 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Sun, 23 Jan 2011 18:57:02 +0000 Subject: [PATCH 098/427] Holly finalized several test cases, she hopes. --- .../AddNonPersonThings/CheckPublicView.html | 11 +- .../AddNonPersonThings/DeleteIndexStuff.html | 10 ++ .../AddNonPersonThingsVB/CheckPublicView.html | 11 +- .../DeleteIndexStuff.html | 10 ++ .../suites/AddPublications/AddArticle.html | 101 +++++++++++++++--- .../suites/AddPublications/AddBook.html | 41 ++++--- .../suites/AddPublications/AddConference.html | 24 ++--- .../AddPublications/AddTestFacultyBack.html | 2 +- .../AddPublications/CheckPublicView.html | 4 +- .../suites/AddPublications/DeleteArticle.html | 2 +- .../suites/AddPublications/DeleteBook.html | 2 +- .../suites/AddPublications/DeleteChapter.html | 2 +- .../AddPublications/DeleteConference.html | 2 +- .../AddPublications/DeleteIndexStuff.html | 8 +- .../AddPublications/DeleteTestFaculty.html | 4 +- .../DeleteValidationStuff.html | 14 +-- .../AddPublications/ValidateFields.html | 38 +------ .../suites/AddPublicationsVB/AddArticle.html | 101 +++++++++++++++--- .../suites/AddPublicationsVB/AddBook.html | 41 ++++--- .../AddPublicationsVB/AddConference.html | 24 ++--- .../AddPublicationsVB/AddTestFacultyBack.html | 2 +- .../AddPublicationsVB/CheckPublicView.html | 4 +- .../AddPublicationsVB/DeleteArticle.html | 2 +- .../suites/AddPublicationsVB/DeleteBook.html | 2 +- .../AddPublicationsVB/DeleteChapter.html | 2 +- .../AddPublicationsVB/DeleteConference.html | 2 +- .../AddPublicationsVB/DeleteIndexStuff.html | 8 +- .../AddPublicationsVB/DeleteTestFaculty.html | 4 +- .../DeleteValidationStuff.html | 14 +-- .../AddPublicationsVB/ValidateFields.html | 38 +------ .../CreatePeople/DeleteFacultyInfo.html | 20 ---- 31 files changed, 330 insertions(+), 220 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html index b3708ea1..eae9a500 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html @@ -386,7 +386,7 @@ verifyTextPresent - Liberia self_governing + Liberia @@ -581,7 +581,7 @@ verifyTextPresent - Kenya self_governing + Kenya @@ -596,7 +596,7 @@ verifyTextPresent - the Congo self_governing + the Congo @@ -2114,11 +2114,6 @@ Primate Diet Subject Area - - verifyTextPresent - related to - - verifyElementPresent link=Elderly Care diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html index f10c38e3..fecd8130 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html @@ -1364,6 +1364,11 @@ Are you SURE you want to delete this entity? If in doubt, CANCEL. + + waitForPageToLoad + 5000 + + assertTitle VIVO Site Administration @@ -1429,6 +1434,11 @@ Are you SURE you want to delete this entity? If in doubt, CANCEL. + + waitForPageToLoad + 5000 + + assertTitle VIVO Site Administration diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckPublicView.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckPublicView.html index b3708ea1..eae9a500 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckPublicView.html @@ -386,7 +386,7 @@ verifyTextPresent - Liberia self_governing + Liberia @@ -581,7 +581,7 @@ verifyTextPresent - Kenya self_governing + Kenya @@ -596,7 +596,7 @@ verifyTextPresent - the Congo self_governing + the Congo @@ -2114,11 +2114,6 @@ Primate Diet Subject Area - - verifyTextPresent - related to - - verifyElementPresent link=Elderly Care diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html index f10c38e3..fecd8130 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html @@ -1364,6 +1364,11 @@ Are you SURE you want to delete this entity? If in doubt, CANCEL. + + waitForPageToLoad + 5000 + + assertTitle VIVO Site Administration @@ -1429,6 +1434,11 @@ Are you SURE you want to delete this entity? If in doubt, CANCEL. + + waitForPageToLoad + 5000 + + assertTitle VIVO Site Administration diff --git a/utilities/acceptance-tests/suites/AddPublications/AddArticle.html b/utilities/acceptance-tests/suites/AddPublications/AddArticle.html index 2b47c01a..d6b70313 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddArticle.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddArticle.html @@ -324,20 +324,20 @@ Edit - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type - name - 2010-10-27 + dateTimeField.year + 2010 + + + select + dateTimeField.month + label=10 + + + select + dateTimeField.day + label=27 clickAndWait @@ -374,6 +374,81 @@ Too Much Nintendo + + clickAndWait + //h3[@id='eanucc13']/a/img + + + + assertTitle + Edit + + + + type + tinymce + DEF12121212 + + + clickAndWait + submit + + + + assertTitle + Too Much Nintendo + + + + clickAndWait + //h3[@id='nihmsid']/a/img + + + + assertTitle + Edit + + + + type + tinymce + NIH9898989898 + + + clickAndWait + submit + + + + assertTitle + Too Much Nintendo + + + + clickAndWait + //h3[@id='pmcid']/a/img + + + + assertTitle + Edit + + + + type + tinymce + PMID767676 + + + clickAndWait + submit + + + + assertTitle + Too Much Nintendo + + clickAndWait //div[@id='wrapper-content']/section[7]/article[1]/h3/a/img @@ -666,7 +741,7 @@ verifyTextPresent - 2010-10-27 + October 27, 2010 diff --git a/utilities/acceptance-tests/suites/AddPublications/AddBook.html b/utilities/acceptance-tests/suites/AddPublications/AddBook.html index 47dc9198..aa4c926d 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddBook.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddBook.html @@ -334,20 +334,10 @@ Edit - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type - name - 2009 + dateTimeField.year + 2010 clickAndWait @@ -356,7 +346,7 @@ assertTitle - exact:Nintendo: Good or Bad for Kids? + Nintendo: Good or Bad for Kids? @@ -494,6 +484,31 @@ exact:Nintendo: Good or Bad for Kids? + + clickAndWait + //h3[@id='numPages']/a/img + + + + assertTitle + Edit + + + + type + tinymce + 258 + + + clickAndWait + submit + + + + assertTitle + exact:Nintendo: Good or Bad for Kids? + + comment Naviage back to Index diff --git a/utilities/acceptance-tests/suites/AddPublications/AddConference.html b/utilities/acceptance-tests/suites/AddPublications/AddConference.html index ee6a80bc..1c61ac9b 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddConference.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddConference.html @@ -284,20 +284,20 @@ Edit - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type - name - 2010-04-01 + dateTimeField.year + 2010 + + + select + dateTimeField.month + label=4 + + + select + dateTimeField.day + label=1 clickAndWait diff --git a/utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html b/utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html index 83c47590..e9c9a765 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html @@ -156,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html b/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html index 88a76ffc..894254f2 100644 --- a/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html @@ -286,7 +286,7 @@ verifyTextPresent - 2010-04-01 + April 1, 2010 @@ -456,7 +456,7 @@ verifyTextPresent - 2010-10-27 + October 27, 2010 diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html b/utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html index e9646a80..f39456cc 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html @@ -136,7 +136,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html b/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html index e30ad4e2..a525aea3 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html @@ -136,7 +136,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html b/utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html index d2ce9599..85eb0a68 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html @@ -136,7 +136,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteConference.html b/utilities/acceptance-tests/suites/AddPublications/DeleteConference.html index b1e32e64..29b17936 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteConference.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteConference.html @@ -136,7 +136,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html index 498bc322..b4dce202 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html @@ -156,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -226,7 +226,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -296,7 +296,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -361,7 +361,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html b/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html index ad206024..8bcf11ec 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html @@ -156,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -236,7 +236,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html b/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html index 57985b01..e011a6b8 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html @@ -161,7 +161,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -231,7 +231,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -301,7 +301,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -371,7 +371,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -441,7 +441,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -511,7 +511,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -581,7 +581,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html index 262f7ed1..abb94f17 100644 --- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html +++ b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html @@ -1871,17 +1871,7 @@ verifyTextPresent - Select an existing Date/Time Value for Nintendo O.K. for Kids - - - - verifyTextPresent - There are no entries in the system to select from. - - - - verifyTextPresent - Please create a new entry. + Create date time value for Nintendo O.K. for Kids @@ -1899,29 +1889,9 @@ //div[@id='wrapper-content']/section[5]/article/h3/a/img - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Edit - - - - verifyTextPresent - Edit "date/time value" entry for Nintendo O.K. for Kids - - type - name + dateTimeField.year 2009 @@ -2056,7 +2026,7 @@ clickAndWait - //div[@id='numPages']/a + //h3[@id='numPages']/a/img @@ -2081,7 +2051,7 @@ clickAndWait - //div[@id='numPages']/a + //h3[@id='numPages']/a/img diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html index 2b47c01a..d6b70313 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html @@ -324,20 +324,20 @@ Edit - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type - name - 2010-10-27 + dateTimeField.year + 2010 + + + select + dateTimeField.month + label=10 + + + select + dateTimeField.day + label=27 clickAndWait @@ -374,6 +374,81 @@ Too Much Nintendo + + clickAndWait + //h3[@id='eanucc13']/a/img + + + + assertTitle + Edit + + + + type + tinymce + DEF12121212 + + + clickAndWait + submit + + + + assertTitle + Too Much Nintendo + + + + clickAndWait + //h3[@id='nihmsid']/a/img + + + + assertTitle + Edit + + + + type + tinymce + NIH9898989898 + + + clickAndWait + submit + + + + assertTitle + Too Much Nintendo + + + + clickAndWait + //h3[@id='pmcid']/a/img + + + + assertTitle + Edit + + + + type + tinymce + PMID767676 + + + clickAndWait + submit + + + + assertTitle + Too Much Nintendo + + clickAndWait //div[@id='wrapper-content']/section[7]/article[1]/h3/a/img @@ -666,7 +741,7 @@ verifyTextPresent - 2010-10-27 + October 27, 2010 diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html index 47dc9198..aa4c926d 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html @@ -334,20 +334,10 @@ Edit - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type - name - 2009 + dateTimeField.year + 2010 clickAndWait @@ -356,7 +346,7 @@ assertTitle - exact:Nintendo: Good or Bad for Kids? + Nintendo: Good or Bad for Kids? @@ -494,6 +484,31 @@ exact:Nintendo: Good or Bad for Kids? + + clickAndWait + //h3[@id='numPages']/a/img + + + + assertTitle + Edit + + + + type + tinymce + 258 + + + clickAndWait + submit + + + + assertTitle + exact:Nintendo: Good or Bad for Kids? + + comment Naviage back to Index diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html index ee6a80bc..1c61ac9b 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html @@ -284,20 +284,20 @@ Edit - - clickAndWait - //input[@id='submit' and @value='add a new item to this list'] - - - - assertTitle - Edit - - type - name - 2010-04-01 + dateTimeField.year + 2010 + + + select + dateTimeField.month + label=4 + + + select + dateTimeField.day + label=1 clickAndWait diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFacultyBack.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFacultyBack.html index 83c47590..e9c9a765 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFacultyBack.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFacultyBack.html @@ -156,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/CheckPublicView.html b/utilities/acceptance-tests/suites/AddPublicationsVB/CheckPublicView.html index 88a76ffc..894254f2 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/CheckPublicView.html @@ -286,7 +286,7 @@ verifyTextPresent - 2010-04-01 + April 1, 2010 @@ -456,7 +456,7 @@ verifyTextPresent - 2010-10-27 + October 27, 2010 diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteArticle.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteArticle.html index e9646a80..f39456cc 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteArticle.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteArticle.html @@ -136,7 +136,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteBook.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteBook.html index e30ad4e2..a525aea3 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteBook.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteBook.html @@ -136,7 +136,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteChapter.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteChapter.html index d2ce9599..85eb0a68 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteChapter.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteChapter.html @@ -136,7 +136,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteConference.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteConference.html index b1e32e64..29b17936 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteConference.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteConference.html @@ -136,7 +136,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteIndexStuff.html index 498bc322..b4dce202 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteIndexStuff.html @@ -156,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -226,7 +226,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -296,7 +296,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -361,7 +361,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteTestFaculty.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteTestFaculty.html index ad206024..8bcf11ec 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteTestFaculty.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteTestFaculty.html @@ -156,7 +156,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -236,7 +236,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteValidationStuff.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteValidationStuff.html index 57985b01..e011a6b8 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteValidationStuff.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteValidationStuff.html @@ -161,7 +161,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -231,7 +231,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -301,7 +301,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -371,7 +371,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -441,7 +441,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -511,7 +511,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -581,7 +581,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html index 262f7ed1..abb94f17 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html @@ -1871,17 +1871,7 @@ verifyTextPresent - Select an existing Date/Time Value for Nintendo O.K. for Kids - - - - verifyTextPresent - There are no entries in the system to select from. - - - - verifyTextPresent - Please create a new entry. + Create date time value for Nintendo O.K. for Kids @@ -1899,29 +1889,9 @@ //div[@id='wrapper-content']/section[5]/article/h3/a/img - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Edit - - - - verifyTextPresent - Edit "date/time value" entry for Nintendo O.K. for Kids - - type - name + dateTimeField.year 2009 @@ -2056,7 +2026,7 @@ clickAndWait - //div[@id='numPages']/a + //h3[@id='numPages']/a/img @@ -2081,7 +2051,7 @@ clickAndWait - //div[@id='numPages']/a + //h3[@id='numPages']/a/img diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html index a99584fb..6b175267 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html @@ -919,26 +919,6 @@ Faculty, Jane - - clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - comment Verify everything is gone From c0a93932a228a136af0de66397f2a1054bba7330 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Sun, 23 Jan 2011 19:15:44 +0000 Subject: [PATCH 099/427] Holly made changes to the custom education and position test suites. --- .../suites/CustomEducationForm/CreateTestFacultyMember.html | 2 +- .../CustomEducationForm/DeleteEducationalBackground.html | 6 +++--- .../suites/CustomEducationForm/DeleteTestFacultyMember.html | 2 +- .../CustomEducationFormVB/CreateTestFacultyMember.html | 2 +- .../CustomEducationFormVB/DeleteEducationalBackground.html | 6 +++--- .../CustomEducationFormVB/DeleteTestFacultyMember.html | 2 +- .../suites/CustomPositionsForm/ChangePositions.html | 6 +++--- .../suites/CustomPositionsForm/CreateTestFacultyMember.html | 2 +- .../suites/CustomPositionsForm/DeletePositions.html | 6 +++--- .../suites/CustomPositionsForm/DeleteTestFacultyMember.html | 2 +- .../suites/CustomPositionsFormVB/ChangePositions.html | 6 +++--- .../CustomPositionsFormVB/CreateTestFacultyMember.html | 2 +- .../suites/CustomPositionsFormVB/DeletePositions.html | 6 +++--- .../CustomPositionsFormVB/DeleteTestFacultyMember.html | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html index c7ca382c..036d78b1 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html @@ -151,7 +151,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html index 1bb15029..51129195 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html @@ -266,7 +266,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -351,7 +351,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -436,7 +436,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html index bca09281..1d4eef72 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html @@ -126,7 +126,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/CreateTestFacultyMember.html index c7ca382c..036d78b1 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/CreateTestFacultyMember.html @@ -151,7 +151,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html index 1bb15029..51129195 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html @@ -266,7 +266,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -351,7 +351,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -436,7 +436,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteTestFacultyMember.html index bca09281..1d4eef72 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteTestFacultyMember.html @@ -126,7 +126,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html index 6771fb98..3b935eb6 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html @@ -151,7 +151,7 @@ clickAndWait - //ul[@id='individual-positions']/li[1]/a[2]/img + //section[@id='individual-info']/header/ul/li[1]/a[2]/img @@ -231,7 +231,7 @@ clickAndWait - //ul[@id='individual-positions']/li[2]/a[2]/img + //section[@id='individual-info']/header/ul/li[2]/a[2]/img @@ -306,7 +306,7 @@ clickAndWait - //ul[@id='individual-positions']/li[1]/a[2]/img + //section[@id='individual-info']/header/ul/li[1]/a[2]/img diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html index c7ca382c..036d78b1 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html @@ -151,7 +151,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html index c2931a7f..cde2669e 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html @@ -226,7 +226,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -296,7 +296,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -366,7 +366,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html index 4c123c89..28837719 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html @@ -126,7 +126,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CustomPositionsFormVB/ChangePositions.html b/utilities/acceptance-tests/suites/CustomPositionsFormVB/ChangePositions.html index 6771fb98..3b935eb6 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsFormVB/ChangePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsFormVB/ChangePositions.html @@ -151,7 +151,7 @@ clickAndWait - //ul[@id='individual-positions']/li[1]/a[2]/img + //section[@id='individual-info']/header/ul/li[1]/a[2]/img @@ -231,7 +231,7 @@ clickAndWait - //ul[@id='individual-positions']/li[2]/a[2]/img + //section[@id='individual-info']/header/ul/li[2]/a[2]/img @@ -306,7 +306,7 @@ clickAndWait - //ul[@id='individual-positions']/li[1]/a[2]/img + //section[@id='individual-info']/header/ul/li[1]/a[2]/img diff --git a/utilities/acceptance-tests/suites/CustomPositionsFormVB/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomPositionsFormVB/CreateTestFacultyMember.html index c7ca382c..036d78b1 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsFormVB/CreateTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomPositionsFormVB/CreateTestFacultyMember.html @@ -151,7 +151,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeletePositions.html b/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeletePositions.html index c2931a7f..cde2669e 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeletePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeletePositions.html @@ -226,7 +226,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -296,7 +296,7 @@ clickAndWait - link=edit this individual + link=Edit this individual @@ -366,7 +366,7 @@ clickAndWait - link=edit this individual + link=Edit this individual diff --git a/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeleteTestFacultyMember.html index 4c123c89..28837719 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeleteTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeleteTestFacultyMember.html @@ -126,7 +126,7 @@ clickAndWait - link=edit this individual + link=Edit this individual From 67ca8332ec67a7585b0b120f34183bec1ef5b1da Mon Sep 17 00:00:00 2001 From: hlm7 Date: Mon, 24 Jan 2011 01:27:30 +0000 Subject: [PATCH 100/427] Holly made various updates to the test suites as needed. --- .../CustomEducationForm/AddEducationBackground.html | 8 ++++---- .../AddEducationBackground.html | 13 ++++--------- .../ChangeEducationBackground.html | 6 +++--- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html index e721083d..be90b0c3 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html @@ -131,7 +131,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img + //h3[@id='educationalTraining']/a/img @@ -156,7 +156,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img + //h3[@id='educationalTraining']/a/img @@ -356,7 +356,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img + //h3[@id='educationalTraining']/a/img @@ -471,7 +471,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img + //h3[@id='educationalTraining']/a/img diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html index e721083d..96f55100 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html @@ -131,7 +131,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img + //h3[@id='educationalTraining']/a/img @@ -156,7 +156,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img + //h3[@id='educationalTraining']/a/img @@ -356,12 +356,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img - - - - assertTitle - Edit + //h3[@id='educationalTraining']/a/img @@ -471,7 +466,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img + //h3[@id='educationalTraining']/a/img diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html index 264d3d51..39226cdd 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html @@ -156,7 +156,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/ul/li[3]/a[2]/img + //div[@id='content']/section[8]/article[1]/ul/li[3]/a[2]/img @@ -246,7 +246,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/ul/li[2]/a[2]/img + //div[@id='content']/section[8]/article[1]/ul/li[2]/a[2]/img @@ -321,7 +321,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/ul/li[1]/a[2]/img + //div[@id='content']/section[8]/article[1]/ul/li[1]/a[2]/img From 8c03f249d12e843bc3f916ade710950c34455731 Mon Sep 17 00:00:00 2001 From: mb863 Date: Mon, 24 Jan 2011 03:08:30 +0000 Subject: [PATCH 101/427] NIHVIVO-1315: Refactoring generic individual pages --- .../freemarker/body/individual/individual.ftl | 5 +++-- .../individual/individual-sparklineVisualization.ftl | 2 ++ .../partials/individual/individual-visualization.ftl | 11 ++++------- themes/wilma/css/wilma.css | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/productMods/templates/freemarker/body/individual/individual.ftl b/productMods/templates/freemarker/body/individual/individual.ftl index 46dab407..896d4280 100644 --- a/productMods/templates/freemarker/body/individual/individual.ftl +++ b/productMods/templates/freemarker/body/individual/individual.ftl @@ -6,9 +6,10 @@ <#assign individualProductExtension> <#include "individual-overview.ftl"> -
-
+ <#include "individual-visualization.ftl"> +
+ <#include "individual-vitro.ftl"> \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl index c62bf94d..a3471b24 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl @@ -3,6 +3,7 @@ <#-- Template for sparkline visualization on individual profile page --> <#if individual.visualizationUrl??> +
<#assign coAuthorIcon = '${urls.images}/visualization/co_author_icon.png'> <#assign coInvestigatorIcon = '${urls.images}/visualization/co_investigator_icon.png'> @@ -64,5 +65,6 @@ }); +
\ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualization.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualization.ftl index 85284ce6..30f78956 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-visualization.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-visualization.ftl @@ -5,11 +5,8 @@ <#if individual.organization > <#-- Logically we only need section#temporal-graph, but css may depend on the outer sections. Leaving here for UI team to check. --> -
-
-
-

Temporal Graph

-
-
-
+
+

Temporal Graph

+
+ \ No newline at end of file diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index eb43f97f..0247a969 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -1122,13 +1122,14 @@ ul#individual-tools{ } /* INDIVIDUAL INTRO FOR PERSON ------> */ #individual-intro-person{ - border-right: 1px solid #edf0ed; + /*border-right: 1px solid #edf0ed;*/ } /* INDIVIDUAL INTRO - LEFT SIDE CONTENT ------> */ img.individual-photo{ border: 7px solid #ebebeb; float: left; margin-right: 20px; + margin-bottom: 20px; } ul#individual-tools-people{ border-bottom: 1px solid #e8ece9; From d3615b71058afb24f29f7464e064fe387d29d0d4 Mon Sep 17 00:00:00 2001 From: mb863 Date: Mon, 24 Jan 2011 03:08:57 +0000 Subject: [PATCH 102/427] NIHVIVO-1316: Refactoring individual foaf person --- .../body/individual/individual--foaf-person.ftl | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index 4f9f7f13..6d7692ab 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -99,15 +99,9 @@ <@p.objectProperty researchAreas editable "propStatement-simple.ftl" /> - - -
-
- <#include "individual-sparklineVisualization.ftl"> -
- + <#include "individual-sparklineVisualization.ftl"> <#-- Disable for now until controller sends data --> <#--
@@ -123,8 +117,8 @@

View All arrow icon

--> +
- <#assign nameForOtherGroup = "other"> <#-- used by both individual-propertyGroupMenu.ftl and individual-properties.ftl --> <#-- Property group menu --> From d736204bfc8530a76dc6d17653ee4bd82b5dffb6 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Mon, 24 Jan 2011 15:01:30 +0000 Subject: [PATCH 103/427] NIHVIVO-1868 Custom query for core:organizationForPosition shows only people in current positions --- .../config/listViewConfig-organizationForPosition.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/productMods/config/listViewConfig-organizationForPosition.xml b/productMods/config/listViewConfig-organizationForPosition.xml index 402443d4..7c32bcff 100644 --- a/productMods/config/listViewConfig-organizationForPosition.xml +++ b/productMods/config/listViewConfig-organizationForPosition.xml @@ -24,8 +24,11 @@ } OPTIONAL { GRAPH ?g8 { ?dateTimeInterval core:end ?dateTimeEndValue } GRAPH ?g9 { ?dateTimeEndValue core:dateTime ?dateTimeEnd } + } - } + # Current positions only: end date is either null or not in the past + } FILTER ( !bound(?dateTimeEnd) || + afn:substring(str(?dateTimeEnd), 0, 4) >= afn:substring(str(afn:now()), 0, 4) ) } ORDER BY ?personName @@ -56,7 +59,9 @@ OPTIONAL { GRAPH ?g10 { ?dateTimeInterval core:end ?dateTimeEndValue } GRAPH ?g11 { ?dateTimeEndValue core:dateTime ?dateTimeEnd } } - } + # Current positions only: end date is either null or not in the past + } FILTER ( !bound(?dateTimeEnd) || + afn:substring(str(?dateTimeEnd), 0, 4) >= afn:substring(str(afn:now()), 0, 4) ) } ORDER BY ?subclass ?personName From 2fa3c98257330bd9e2a390b1e82a59ba630bca8f Mon Sep 17 00:00:00 2001 From: hlm7 Date: Mon, 24 Jan 2011 15:24:07 +0000 Subject: [PATCH 104/427] Holly update two test suites for vivo-basic due to changes made to application. --- .../CreateOrganization.html | 60 ++++++++----------- .../suites/CreatePeopleVB/AddFacultyInfo.html | 36 +++++------ .../CreatePeopleVB/AddFacultyInfo2.html | 20 +++---- .../CreatePeopleVB/ChangeFacultyImage.html | 5 -- .../CreatePeopleVB/DeleteFacultyInfo.html | 20 ------- .../CreatePeopleVB/DeleteTestPeople.html | 10 ---- .../CreatePeopleVB/EditFacultyInfo.html | 59 ++++++------------ 7 files changed, 70 insertions(+), 140 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html index a3c9b5e1..bcf8d576 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html @@ -241,7 +241,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[4]/h3/a/img + //h3[@id='offersDegree']/a/img @@ -266,7 +266,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[2]/h3/a/img + //h3[@id='hasPredecessorOrganization']/a/img @@ -286,7 +286,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[5]/h3/a/img + //h3[@id='awardsGrant']/a/img @@ -321,7 +321,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[7]/h3/a/img + //h3[@id='sponsors']/a/img @@ -356,7 +356,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[8]/h3/a/img + //h3[@id='awardConferred']/a/img @@ -391,7 +391,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[9]/h3/a/img + //h3[@id='hasEquipment']/a/img @@ -426,7 +426,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[6]/h3/a/img + //h3[@id='subcontractsGrant']/a/img @@ -506,7 +506,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[2]/h3/a/img + //h3[@id='subOrganizationWithin']/a/img @@ -529,11 +529,6 @@ Edit - - type - name - Primate - type name @@ -551,7 +546,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[3]/h3/a/img + //h3[@id='organizationForPosition']/a/img @@ -581,7 +576,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[4]/h3/a/img + //h3[@id='hasLeaderRole']/a/img @@ -621,7 +616,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[5]/h3/a/img + //h3[@id='affiliatedOrganization']/a/img @@ -646,7 +641,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[6]/h3/a/img + //h3[@id='hasMemberRole']/a/img @@ -686,7 +681,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[7]/h3/a/img + //h3[@id='hasCollaborator']/a/img @@ -711,7 +706,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[8]/h3/a/img + //h3[@id='hasClinicalRole']/a/img @@ -756,7 +751,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[1]/h3/a/img + //h3[@id='authorInAuthorship']/a/img @@ -786,7 +781,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[2]/h3/a/img + //h3[@id='hasPresenterRole']/a @@ -831,7 +826,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[1]/h3/a/img + //h3[@id='hasOutreachProviderRole']/a/img @@ -881,7 +876,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article/h3/a/img + //h3[@id='hasGeographicLocation']/a/img @@ -911,7 +906,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img + //h3[@id='email']/a/img @@ -936,7 +931,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img + //h3[@id='phoneNumber']/a/img @@ -961,7 +956,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[3]/h3/a/img + //h3[@id='faxNumber']/a/img @@ -986,7 +981,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[4]/h3/a/img + //h3[@id='mailingAddress']/a/img @@ -1031,7 +1026,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article/h3/a/img + //h3[@id='dateTimeInterval']/a/img @@ -1054,11 +1049,6 @@ Primate College of America - - assertTitle - Primate College of America - - comment Test other entry @@ -1066,7 +1056,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[2]/h3/a/img + //h3[@id='abbreviation']/a/img @@ -1091,7 +1081,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[3]/h3/a/img + //h3[@id='freetextKeyword']/a/img diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html index ce44d4f3..cd565c43 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo.html @@ -196,7 +196,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[4]/h3/a/img + //h3[@id='hasCollaborator']/a/img @@ -216,7 +216,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[1]/h3/a/img + //h3[@id='preferredTitle']/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[1]/h3/a/img + //h3[@id='researchOverview']/a @@ -266,7 +266,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[6]/h3/a/img + //h3[@id='geographicFocus']/a/img @@ -291,7 +291,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[3]/h3/a/img + //h3[@id='advisorIn']/a/img @@ -326,7 +326,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[1]/h3/a/img + //h3[@id='teachingOverview']/a/img @@ -351,7 +351,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[1]/h3/a/img + //h3[@id='outreachOverview']/a/img @@ -376,7 +376,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[3]/h3/a/img + //h3[@id='adviseeIn']/a/img @@ -411,7 +411,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img + //h3[@id='awardOrHonor']/a/img @@ -441,7 +441,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[2]/h3/a/img + //h3[@id='middleName']/a/img @@ -491,7 +491,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[6]/h3/a/img + //h3[@id='faxNumber']/a/img @@ -541,7 +541,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[7]/h3/a/img + //h3[@id='mailingAddress']/a/img @@ -571,7 +571,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[4]/h3/a/img + //h3[@id='prefixName']/a/img @@ -596,7 +596,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[5]/h3/a/img + //h3[@id='suffixName']/a/img @@ -621,7 +621,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[1]/h3/a/img + //h3[@id='orcidId']/a/img @@ -646,7 +646,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[3]/h3/a/img + //h3[@id='scopusId']/a/img @@ -671,7 +671,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[2]/h3/a/img + //h3[@id='researcherId']/a/img @@ -696,7 +696,7 @@ clickAndWait - //div[@id='wrapper-content']/section[11]/article/h3/a/img + //h3[@id='freetextKeyword']/a/img diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html index 016d414a..853e32b0 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddFacultyInfo2.html @@ -171,7 +171,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[6]/h3/a/img + //h3[@id='geographicFocus']/a/img @@ -196,7 +196,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[3]/h3/a/img + //h3[@id='advisorIn']/a/img @@ -231,7 +231,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[3]/h3/a/img + //h3[@id='adviseeIn']/a @@ -266,7 +266,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img + //h3[@id='awardOrHonor']/a/img @@ -326,7 +326,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[6]/h3/a/img + //h3[@id='faxNumber']/a/img @@ -376,7 +376,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[7]/h3/a/img + //h3[@id='mailingAddress']/a/img @@ -411,7 +411,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[1]/h3/a/img + //h3[@id='orcidId']/a/img @@ -436,7 +436,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[3]/h3/a/img + //h3[@id='researcherId']/a/img @@ -461,7 +461,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[2]/h3/a/img + //h3[@id='scopusId']/a/img @@ -486,7 +486,7 @@ clickAndWait - //div[@id='wrapper-content']/section[11]/article/h3/a/img + //h3[@id='freetextKeyword']/a/img diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html index 49e471c0..bb1a1c3b 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/ChangeFacultyImage.html @@ -264,11 +264,6 @@ Photo Upload - - verifyTextPresent - Photo Upload - - verifyTextPresent Your profile photo will look like the image below. diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html index a99584fb..6b175267 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteFacultyInfo.html @@ -919,26 +919,6 @@ Faculty, Jane - - clickAndWait - //img[@alt='delete'] - - - - assertTitle - Edit - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - comment Verify everything is gone diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html index 1e5749d2..c039a574 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html @@ -89,16 +89,6 @@ VIVO - - clickAndWait - link=People - - - - assertTitle - People - - comment Navigate to Jane Faculty diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html index 95a5c86f..56733268 100644 --- a/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeopleVB/EditFacultyInfo.html @@ -196,32 +196,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[4]/ul/li/a[2]/img - - - - assertTitle - Edit - - - - select - objectVar - label=Faculty, Jane - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //div[@id='wrapper-content']/section[3]/article[1]/ul/li/a[1]/img + //div[@id='content']/section[3]/article[1]/ul/li/a[1]/img @@ -246,7 +221,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[1]/ul/li/a[1]/img + //div[@id='content']/section[5]/article[1]/ul/li/a[1]/img @@ -271,7 +246,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[6]/ul/li/a[2]/img + //div[@id='content']/section[5]/article[6]/ul/li/a[2] @@ -311,7 +286,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[3]/ul/li/a[2]/img + //div[@id='content']/section[6]/article[3]/ul/li/a[2]/img @@ -346,7 +321,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[1]/ul/li/a[1]/img + //div[@id='content']/section[6]/article[1]/ul/li/a[1]/img @@ -371,7 +346,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[1]/ul/li/a[1]/img + //div[@id='content']/section[7]/article[1]/ul/li/a[1]/img @@ -396,7 +371,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[3]/ul/li/a[2]/img + //div[@id='content']/section[8]/article[3]/ul/li/a[2]/img @@ -431,7 +406,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[2]/ul/li/a[2]/img + //div[@id='content']/section[8]/article[2]/ul/li/a[2]/img @@ -466,7 +441,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[2]/ul/li/a[1]/img + //div[@id='content']/section[9]/article[2]/ul/li/a[1]/img @@ -516,7 +491,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[6]/ul/li/a[1]/img + //div[@id='content']/section[9]/article[6]/ul/li/a[1]/img @@ -571,7 +546,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[7]/ul/li/a[2]/img + //div[@id='content']/section[9]/article[7]/ul/li/a[2]/img @@ -606,7 +581,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[4]/ul/li/a[1]/img + //div[@id='content']/section[9]/article[4]/ul/li/a[1]/img @@ -631,7 +606,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article[5]/ul/li/a[1]/img + //div[@id='content']/section[9]/article[5]/ul/li/a[1]/img @@ -656,7 +631,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[1]/ul/li/a[1]/img + //div[@id='content']/section[10]/article[1]/ul/li/a[1]/img @@ -681,7 +656,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[3]/ul/li/a[1]/img + //div[@id='content']/section[10]/article[2]/ul/li/a[1]/img @@ -706,7 +681,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[2]/ul/li/a[1]/img + //div[@id='content']/section[10]/article[3]/ul/li/a[1]/img @@ -731,7 +706,7 @@ clickAndWait - //div[@id='wrapper-content']/section[11]/article/ul/li/a[1]/img + //div[@id='content']/section[11]/article/ul/li/a[1]/img From 8a3f71f08fe47aeb987bb7e82c436e21756802c5 Mon Sep 17 00:00:00 2001 From: cdtank Date: Mon, 24 Jan 2011 15:28:19 +0000 Subject: [PATCH 105/427] fixed license issue --- productMods/js/visualization/visualization-helper-functions.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/productMods/js/visualization/visualization-helper-functions.js b/productMods/js/visualization/visualization-helper-functions.js index 15081334..fff90383 100644 --- a/productMods/js/visualization/visualization-helper-functions.js +++ b/productMods/js/visualization/visualization-helper-functions.js @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + /** * For rendering images dynamically. * From 9d311d21840cc2020fb54a78e253bd1cb6cf2cfb Mon Sep 17 00:00:00 2001 From: mb863 Date: Mon, 24 Jan 2011 15:39:51 +0000 Subject: [PATCH 106/427] NIHVIVO-1867: Fixed the overlaps of the Submit button with the gray box showing selected author on author form --- productMods/edit/forms/css/customForm.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/productMods/edit/forms/css/customForm.css b/productMods/edit/forms/css/customForm.css index 2d4bd734..72baf379 100644 --- a/productMods/edit/forms/css/customForm.css +++ b/productMods/edit/forms/css/customForm.css @@ -113,6 +113,9 @@ form.customForm a.close:visited { form.customForm textarea { width: 30%; } +div.acSelection{ + margin-bottom: 15px; +} /* fix bad alignment in IE 6 and 7 .or, .cancel{ From fae8eab511ef9e20fcaa375beb14215a64827315 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Mon, 24 Jan 2011 16:01:50 +0000 Subject: [PATCH 107/427] Holly finalized the vivo-basic version of the AddNonPersonThings test suite. --- .../AddNonPersonThingsVB/CreateActivity.html | 24 ++++++++--------- .../AddNonPersonThingsVB/CreateCourse.html | 26 +++++++++---------- .../AddNonPersonThingsVB/CreateEquipment.html | 8 +++--- .../AddNonPersonThingsVB/CreateEvent.html | 22 ++++++++-------- .../AddNonPersonThingsVB/CreateLocation.html | 10 +++---- .../AddNonPersonThingsVB/CreateTopic.html | 12 ++++----- .../DeleteIndexStuff.html | 5 ---- 7 files changed, 51 insertions(+), 56 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html index f7a9a0d7..f3aed1ed 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[1]/h3/a/img + //h3[@id='administeredBy']/a/img @@ -236,7 +236,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[2]/h3/a/img + //h3[@id='grantAwardedBy']/a/img @@ -266,7 +266,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[4]/h3/a/img + //h3[@id='abstract']/a/img @@ -296,7 +296,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[5]/h3/a/img + //h3[@id='grantSubcontractedThrough']/a @@ -321,7 +321,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[6]/h3/a/img + //h3[@id='totalAwardAmount']/a/img @@ -351,7 +351,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[7]/h3/a/img + //h3[@id='grantDirectCosts']/a/img @@ -376,7 +376,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[8]/h3/a/img + //h3[@id='sponsorAwardId']/a/img @@ -406,7 +406,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article/h3/a/img + //h3[@id='geographicFocus']/a/img @@ -436,7 +436,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article/h3/a/img + //h3[@id='dateTimeInterval']/a/img @@ -491,7 +491,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article/h3/a/img + //h3[@id='localAwardId']/a/img @@ -526,7 +526,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[1]/h3/a/img + //h3[@id='fundingVehicleFor']/a/img @@ -556,7 +556,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[2]/h3/a/img + //h3[@id='hasSubjectArea']/a/img diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html index a04f4093..d968cccd 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[3]/h3/a/img + //h3[@id='description']/a/img @@ -236,7 +236,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[2]/h3/a/img + //h3[@id='courseOfferedBy']/a/img @@ -261,7 +261,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[4]/h3/a/img + //h3[@id='organizer']/a/img @@ -281,7 +281,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[5]/h3/a/img + //h3[@id='prerequisiteFor']/a/img @@ -306,7 +306,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[6]/h3/a/img + //h3[@id='contactInformation']/a/img @@ -341,7 +341,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article/h3/a/img + //h3[@id='geographicFocus']/a/img @@ -371,7 +371,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article/h3/a/img + //h3[@id='hasGeographicLocation']/a/img @@ -406,7 +406,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article/h3/a/img + //h3[@id='dateTimeInterval']/a @@ -466,7 +466,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article/h3/a/img + //h3[@id='presents']/a/img @@ -521,7 +521,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img + //h3[@id='includesEvent']/a/img @@ -546,7 +546,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img + //h3[@id='hasSubjectArea']/a/img @@ -586,7 +586,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[4]/h3/a/img + //h3[@id='courseCredits']/a/img @@ -651,7 +651,7 @@ verifyTextPresent - September 1, 2007 - December 15, 2007 + September 1, 2007 - December 15, 2007 diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEquipment.html index 0f76c3a7..5abfd3a5 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEquipment.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEquipment.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article/h3/a/img + //h3[@id='equipmentFor']/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article/h3/a/img + //h3[@id='equipmentInFacility']/a/img @@ -296,7 +296,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img + //h3[@id='hasSubjectArea']/a/img @@ -326,7 +326,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[2]/h3/a/img + //h3[@id='freetextKeyword']/a/img diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html index 5dd4fe75..f5b59f25 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[2]/h3/a/img + //h3[@id='description']/a/img @@ -236,7 +236,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[3]/h3/a/img + //h3[@id='hasProceedings']/a/img @@ -296,7 +296,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[4]/h3/a/img + //h3[@id='organizer']/a/img @@ -321,7 +321,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[5]/h3/a/img + //h3[@id='contactInformation']/a/img @@ -356,7 +356,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article/h3/a/img + //h3[@id='geographicFocus']/a/img @@ -391,7 +391,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article/h3/a/img + //h3[@id='hasGeographicLocation']/a/img @@ -426,7 +426,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article/h3/a/img + //h3[@id='dateTimeInterval']/a/img @@ -481,7 +481,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article/h3/a/img + //h3[@id='presents']/a/img @@ -506,7 +506,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img + //h3[@id='includesEvent']/a/img @@ -536,7 +536,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[1]/h3/a/img + //h3[@id='hasSubjectArea']/a/img @@ -561,7 +561,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img + //h3[@id='abbreviation']/a/img diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLocation.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLocation.html index 444eacff..81a90a17 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLocation.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLocation.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article/h3/a/img + //h3[@id='facilityFor']/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[1]/h3/a/img + //h3[@id='hasRoom']/a/img @@ -286,7 +286,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[2]/h3/a + //h3[@id='geographicallyContains']/a/img @@ -341,7 +341,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img + //h3[@id='locationOfEquipment']/a/img @@ -366,7 +366,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[2]/h3/a/img + //h3[@id='geographicLocationOf']/a/img diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateTopic.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateTopic.html index d8e481e2..20b5935c 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateTopic.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateTopic.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article/h3/a/img + //h3[@id='broader']/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article/h3/a/img + //h3[@id='researchAreaOf']/a/img @@ -271,7 +271,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article/h3/a/img + //h3[@id='sourceVocabularyReference']/a/img @@ -316,7 +316,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[1]/h3/a/img + //h3[@id='subjectAreaFor']/a/img @@ -346,7 +346,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[2]/h3/a/img + //h3[@id='narrower']/a/img @@ -391,7 +391,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[3]/h3/a/img + //h3[@id='related']/a/img diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html index fecd8130..ceb7ed11 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html @@ -149,11 +149,6 @@ equipment - - verifyTextPresent - Academic Term (1) - - verifyTextPresent research From dfd6f7f488bd5faac418a0982e261eba22e242fa Mon Sep 17 00:00:00 2001 From: hlm7 Date: Mon, 24 Jan 2011 16:30:52 +0000 Subject: [PATCH 108/427] Holly did some initial updating of the AddPublications test suite for the vivo-basic theme. --- .../AddPublicationsVB/ValidateFields.html | 104 +++++++++--------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html index abb94f17..df9683d2 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html @@ -141,7 +141,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img + //h3[@id='authorInAuthorship']/a/img @@ -181,7 +181,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img + //h3[@id='authorInAuthorship']/a/img @@ -606,7 +606,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[2]/h3/a/img + //h3[@id='informationResourceInAuthorship']/a/img @@ -641,7 +641,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[2]/h3/a/img + //h3[@id='informationResourceInAuthorship']/a/img @@ -726,7 +726,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img + //h3[@id='editor']/a/img @@ -761,7 +761,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img + //h3[@id='editor']/a/img @@ -791,7 +791,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[4]/h3/a/img + //h3[@id='volume']/a/img @@ -821,7 +821,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[4]/h3/a/img + //h3[@id='volume']/a/img @@ -851,7 +851,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[5]/h3/a/img + //h3[@id='number']/a/img @@ -881,7 +881,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[5]/h3/a/img + //h3[@id='number']/a/img @@ -911,7 +911,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[3]/h3/a/img + //h3[@id='pageStart']/a/img @@ -941,7 +941,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[3]/h3/a/img + //h3[@id='pageStart']/a/img @@ -1031,7 +1031,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[5]/h3/a/img + //h3[@id='pageEnd']/a/img @@ -1061,7 +1061,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[5]/h3/a/img + //h3[@id='pageEnd']/a/img @@ -1091,7 +1091,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[6]/h3/a/img + //h3[@id='features']/a/img @@ -1121,7 +1121,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[6]/h3/a/img + //h3[@id='features']/a/img @@ -1151,7 +1151,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[7]/h3/a/img + //h3[@id='publisher']/a/img @@ -1186,7 +1186,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[7]/h3/a/img + //h3[@id='publisher']/a/img @@ -1221,7 +1221,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[7]/h3/a/img + //h3[@id='publisher']/a/img @@ -1266,7 +1266,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[8]/h3/a/img + //h3[@id='placeOfPublication']/a/img @@ -1296,7 +1296,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[8]/h3/a/img + //h3[@id='placeOfPublication']/a/img @@ -1326,7 +1326,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[7]/h3/a/img + //h3[@id='abstract']/a/img @@ -1356,7 +1356,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[7]/h3/a/img + //h3[@id='abstract']/a/img @@ -1386,7 +1386,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[8]/h3/a/img + //h3[@id='hasPublicationVenue']/a/img @@ -1411,7 +1411,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[8]/h3/a/img + //h3[@id='hasPublicationVenue']/a/img @@ -1456,7 +1456,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[9]/h3/a/img + //h3[@id='edition']/a/img @@ -1486,7 +1486,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[9]/h3/a/img + //h3[@id='edition']/a/img @@ -1516,7 +1516,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[10]/h3/a/img + //h3[@id='presentedAt']/a/img @@ -1541,7 +1541,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[10]/h3/a/img + //h3[@id='presentedAt']/a/img @@ -1586,7 +1586,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[11]/h3/a/img + //h3[@id='status']/a/img @@ -1611,7 +1611,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[11]/h3/a/img + //h3[@id='status']/a/img @@ -1641,7 +1641,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[3]/h3/a/img + //h3[@id='hasPart']/a/img @@ -1671,7 +1671,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[3]/h3/a/img + //h3[@id='hasPart']/a/img @@ -1716,7 +1716,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article/h3/a/img + //h3[@id='partOf']/a/img @@ -1751,7 +1751,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article/h3/a/img + //h3[@id='partOf']/a/img @@ -1796,7 +1796,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article/h3/a/img + //h3[@id='geographicFocus']/a/img @@ -1826,7 +1826,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article/h3/a/img + //h3[@id='geographicFocus']/a/img @@ -1861,7 +1861,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article/h3/a/img + //h3[@id='dateTimeValue']/a @@ -1886,7 +1886,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article/h3/a/img + //h3[@id='dateTimeValue']/a @@ -1911,7 +1911,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[1]/h3/a/img + //h3[@id='oclcnum']/a/img @@ -1936,7 +1936,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[1]/h3/a/img + //h3[@id='oclcnum']/a/img @@ -1966,7 +1966,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[2]/h3/a/img + //h3[@id='pmid']/a/img @@ -1996,7 +1996,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[2]/h3/a/img + //h3[@id='pmid']/a/img @@ -2081,7 +2081,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img + //h3[@id='hasSubjectArea']/a/img @@ -2116,7 +2116,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img + //h3[@id='hasSubjectArea']/a/img @@ -2151,7 +2151,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img + //h3[@id='hasSubjectArea']/a/img @@ -2191,7 +2191,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img + //h3[@id='freetextKeyword']/a/img @@ -2221,7 +2221,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img + //h3[@id='freetextKeyword']/a/img @@ -2251,7 +2251,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[9]/h3/a/img + //h3[@id='reproducedIn']/a/img @@ -2281,7 +2281,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[9]/h3/a/img + //h3[@id='reproducedIn']/a/img @@ -2311,7 +2311,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[10]/h3/a + //h3[@id='reproduces']/a/img @@ -2336,7 +2336,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[10]/h3/a + //h3[@id='reproduces']/a/img From bdda1b950d1a9e059d01ff1fba3ac294af0a328a Mon Sep 17 00:00:00 2001 From: cdtank Date: Mon, 24 Jan 2011 16:32:32 +0000 Subject: [PATCH 109/427] 1. Added "Clear" buttons per Katy's request in temporal graph vis. --- productMods/css/visualization/entitycomparison/layout.css | 4 ++++ .../entityComparisonGrantsStandaloneActivator.ftl | 7 ++++--- .../entityComparisonStandaloneActivator.ftl | 7 ++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/productMods/css/visualization/entitycomparison/layout.css b/productMods/css/visualization/entitycomparison/layout.css index 48741d86..cd3e7599 100644 --- a/productMods/css/visualization/entitycomparison/layout.css +++ b/productMods/css/visualization/entitycomparison/layout.css @@ -25,6 +25,10 @@ a.temporalGraphLinks { text-decoration: none; } +a.clear-selected-entities { + background-color: #878787; +} + #paginated-table-footer { margin-top: 10px; text-align: right; diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl index 45d3a554..66788718 100644 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl @@ -99,10 +99,10 @@ var organizationLabel = '${organizationLabel}'; //click event handler for clear button - $("a#clear").click(function(){ + $("a.clear-selected-entities").click(function(){ clearRenderedObjects(); }); - + /* * When the intra-entity parameters are clicked, * update the status accordingly. @@ -307,6 +307,7 @@ var organizationLabel = '${organizationLabel}';
<#-- @@ -331,7 +332,7 @@ var organizationLabel = '${organizationLabel}';

You have selected 0 of a maximum 10 schools to compare. - Clear + Clear

diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl index 2db6a04c..9fb08cbf 100644 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl @@ -97,7 +97,7 @@ var organizationLabel = '${organizationLabel}'; init(graphContainer); //click event handler for clear button - $("a#clear").click(function(){ + $("a.clear-selected-entities").click(function(){ clearRenderedObjects(); }); @@ -141,7 +141,7 @@ var organizationLabel = '${organizationLabel}'; } }); - //parse the json object and pass it to loadData + //parse the json object and pass it to loadData jsonObject.prepare(jQuery.parseJSON(jsonString)); function performEntityCheckboxUnselectedActions(entity, checkboxValue, checkbox) { @@ -304,6 +304,7 @@ var organizationLabel = '${organizationLabel}';
<#-- @@ -328,7 +329,7 @@ var organizationLabel = '${organizationLabel}';

You have selected 0 of a maximum 10 schools to compare. - Clear + Clear

From 7a6147b26aa52ad4e9c126d4845fc6cab0971573 Mon Sep 17 00:00:00 2001 From: mb863 Date: Mon, 24 Jan 2011 17:08:51 +0000 Subject: [PATCH 110/427] NIHVIVO-1884: Fixed: Over text on foaf:Person page is extending too far to the right --- .../individual/individual--foaf-person.ftl | 34 +++++++++---------- themes/wilma/css/wilma.css | 1 + 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index 6d7692ab..c3b71660 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -58,6 +58,23 @@
+ <#include "individual-sparklineVisualization.ftl"> + <#-- Disable for now until controller sends data --> + <#-- +
+
+

10 Co-Authors

+
+ +
    +
    • +
    • +
+ +

View All arrow icon

+
+ --> + <#if individual.showAdminPanel> <#include "individual-adminPanel.ftl"> @@ -100,23 +117,6 @@
- - <#include "individual-sparklineVisualization.ftl"> - <#-- Disable for now until controller sends data --> - <#-- -
-
-

10 Co-Authors

-
- -
    -
    • -
    • -
- -

View All arrow icon

-
- --> <#assign nameForOtherGroup = "other"> <#-- used by both individual-propertyGroupMenu.ftl and individual-properties.ftl --> diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index 0247a969..7b257203 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -1212,6 +1212,7 @@ ul#individual-positions li a{ font-size: 1em; padding-right: 10px; padding-top: 10px; + width: 75%; } ul#individual-areas{ padding-bottom: 24px; From 0c9a7114fac17d76a49648ec391c97a7c66faf63 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Mon, 24 Jan 2011 17:18:29 +0000 Subject: [PATCH 111/427] Holly finalized the AddPublications test suite for the vivo-basic theme. --- .../suites/AddPublicationsVB/AddArticle.html | 24 +++++++++---------- .../suites/AddPublicationsVB/AddBook.html | 20 ++++++++-------- .../suites/AddPublicationsVB/AddChapter.html | 18 +++++++------- .../AddPublicationsVB/AddConference.html | 14 +++++------ 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html index d6b70313..9d2b1d9c 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html @@ -156,7 +156,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img + //h3[@id='authorInAuthorship']/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[4]/h3/a/img + //h3[@id='volume']/a/img @@ -266,7 +266,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[4]/h3/a/img + //h3[@id='pageStart']/a/img @@ -291,7 +291,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[5]/h3/a/img + //h3[@id='pageEnd']/a/img @@ -316,7 +316,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article/h3/a/img + //h3[@id='dateTimeValue']/a/img @@ -351,7 +351,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[6]/h3/a/img + //h3[@id='pmid']/a/img @@ -451,7 +451,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[1]/h3/a/img + //h3[@id='hasSubjectArea']/a/img @@ -471,7 +471,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img + //h3[@id='freetextKeyword']/a/img @@ -496,7 +496,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img + //h3[@id='freetextKeyword']/a/img @@ -521,7 +521,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[1]/h3/a/img + //h3[@id='issue']/a/img @@ -546,7 +546,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[4]/h3/a + //h3[@id='doi']/a/img @@ -741,7 +741,7 @@ verifyTextPresent - October 27, 2010 + October 27, 2010 diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html index aa4c926d..dcbd91c4 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html @@ -151,7 +151,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img + //h3[@id='authorInAuthorship']/a/img @@ -236,7 +236,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[7]/h3/a/img + //h3[@id='publisher']/a/img @@ -276,7 +276,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[8]/h3/a/img + //h3[@id='placeOfPublication']/a/img @@ -301,7 +301,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[11]/h3/a/img + //h3[@id='status']/a/img @@ -326,7 +326,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article/h3/a/img + //h3[@id='dateTimeValue']/a/img @@ -351,7 +351,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[1]/h3/a/img + //h3[@id='hasSubjectArea']/a/img @@ -386,7 +386,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img + //h3[@id='freetextKeyword']/a/img @@ -411,7 +411,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img + //h3[@id='freetextKeyword']/a/img @@ -436,7 +436,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[3]/h3/a/img + //h3[@id='isbn10']/a/img @@ -461,7 +461,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[5]/h3/a/img + //h3[@id='isbn13']/a/img diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html index df2dd51d..0f1dc563 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html @@ -151,7 +151,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img + //h3[@id='authorInAuthorship']/a/img @@ -236,7 +236,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img + //h3[@id='editor']/a @@ -271,7 +271,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[3]/h3/a/img + //h3[@id='pageStart']/a/img @@ -296,7 +296,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[5]/h3/a + //h3[@id='pageEnd']/a/img @@ -346,7 +346,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[7]/h3/a/img + //h3[@id='publisher']/a/img @@ -386,7 +386,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[8]/h3/a/img + //h3[@id='placeOfPublication']/a/img @@ -411,7 +411,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img + //h3[@id='hasSubjectArea']/a/img @@ -431,7 +431,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img + //h3[@id='freetextKeyword']/a/img @@ -456,7 +456,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img + //h3[@id='freetextKeyword']/a/img diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html index 1c61ac9b..d1cd18a6 100644 --- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html +++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html @@ -156,7 +156,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img + //h3[@id='authorInAuthorship']/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[10]/h3/a/img + //h3[@id='presentedAt']/a/img @@ -276,7 +276,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article/h3/a/img + //h3[@id='dateTimeValue']/a/img @@ -311,7 +311,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[1]/h3/a/img + //h3[@id='hasSubjectArea']/a/img @@ -331,7 +331,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img + //h3[@id='freetextKeyword']/a/img @@ -356,7 +356,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img + //h3[@id='freetextKeyword']/a/img @@ -481,7 +481,7 @@ comment - Verify Book shows up for Frank Furter + Verify Conference Paper shows up for Frank Furter From 84e0df49521345232557caeef5bf60c4d7dab653 Mon Sep 17 00:00:00 2001 From: mb863 Date: Mon, 24 Jan 2011 17:43:56 +0000 Subject: [PATCH 112/427] NIHVIVO-1885: Fixed: Links to organizations in person's Positions list are not colored like other property links --- .../freemarker/body/individual/individual--foaf-person.ftl | 2 +- themes/wilma/css/wilma.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index c3b71660..aa423ecf 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -99,7 +99,7 @@ <#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!> <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->

${positions.name?capitalize} <@p.addLink positions editable />

- - + From ff52e4d798e17f7c93bd259c780288e36509620b Mon Sep 17 00:00:00 2001 From: sjm222 Date: Fri, 4 Feb 2011 18:31:10 +0000 Subject: [PATCH 325/427] link project to outcomes and document project class. --- .../WEB-INF/filegraph/tbox/scires-1.2.owl | 22 +- .../WEB-INF/filegraph/tbox/vivo-core-1.2.owl | 2502 +++++++++-------- .../user/vivo-core-1.2-annotations.rdf | 22 +- productMods/WEB-INF/submodels/scires-1.2.owl | 22 +- .../WEB-INF/submodels/vivo-core-1.2.owl | 2502 +++++++++-------- 5 files changed, 2563 insertions(+), 2507 deletions(-) diff --git a/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl b/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl index 62782ca0..53e0b6ab 100644 --- a/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl +++ b/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl @@ -21,11 +21,6 @@ - - - - - @@ -33,9 +28,9 @@ + An implement used to facilitate work, especially precision work. An implement used to facilitate work, especially precision work. - @@ -115,17 +110,17 @@ NOTE that we are not addressing for now the issue of whether a foaf:Person is a eagle-i: Research project that uses or collects measurements or assessments about humans. + + + + Every clinical trial in the United States must be approved and monitored by an Institutional Review Board (IRB). An IRB is an independent committee of physicians, statisticians, community advocates and others whose objective is to ensure that a clinical trial is ethical and the rights of study participants are protected. + A portion or quantity of a biological material for use in testing, examination, or study. eagle-i: Material entity that is a portion or quantity of a biological material for use in testing, examination, or study. A biological specimen can be an individual animal, part of or derived an animal, plant, part of a plant, or microorganism. When a taxon is described, it is typically based on a single specimen and is referred to as the holotype. An individual animal, part of or derived an animal, plant, part of a plant, or microorganism. - - - - Every clinical trial in the United States must be approved and monitored by an Institutional Review Board (IRB). An IRB is an independent committee of physicians, statisticians, community advocates and others whose objective is to ensure that a clinical trial is ethical and the rights of study participants are protected. - In Phase 3 trials, an experimental study drug or treatment is given to large groups of people (1,000-3,000) to confirm its effectiveness, monitor side effects, compare it to commonly used treatments, and collect information that will allow the experimental drug or treatment to be used safely. @@ -139,6 +134,11 @@ NOTE: For now we are not addressing whether this is a subclass of foaf:AgentMaterial entity that is used in a chemical reaction or other experimental process to detect, measure, examine, or produce other substances. + + + + + diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl index dcd70273..1716bfa3 100644 --- a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl +++ b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl @@ -25,6 +25,11 @@ A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available in PubMed Central. The PMCID is issued shortly after the PI or author approves the PubMed Central formatted web version of the submission. + + + + + http://purl.org/ontology/bibo/ Short Definition from bibo ontology @@ -49,6 +54,16 @@ + + + + + + + + + + @@ -62,11 +77,6 @@ An organized series of a meeting for an exchange of ideas, typically put on by a department or center. - - - 1 - - @@ -93,12 +103,12 @@ - + UN Cartographic Section UN Cartographic Section - + - + @@ -106,18 +116,38 @@ + + + + + + + + + + + + + + + + + + + + Accounting & Research Services Assistant; Director of Information Technology Staff, support, and other non-academic positions. + A position classified as professional, staff, support, or any other non-academic role - - + @@ -132,16 +162,6 @@ Serial Item and Contribution Identifier - - - 1 - - - - - - - @@ -151,11 +171,6 @@ - - - - - Definition take from: http://en.wikipedia.org/wiki/Government_agency. United States Library of Congress @@ -173,6 +188,11 @@ + + + + + @@ -204,30 +224,30 @@ Definition take from: http://xmlns.com/foaf/spec/#term_based_near . foaf indicates that the status of this term is "unstable". "The based_near relationship relates two "spatial things" (anything that can be somewhere), the latter typically described using the geo:lat / geo:long geo-positioning vocabulary (http://www.w3.org/2003/01/geo/wgs84_pos#). This allows us to say describe the typical latitute and longitude of, say, a Person (people are spatial things - they can be places) without implying that a precise location has been given." Used to link an agent, related to bibliographic things, to a place where it is based near: can be a city, a monument, a building, etc. + + + + + Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - - - The most general classification of a person - + The most general classification of a person - + + + + + + - - - 1 - - http://purl.org/ontology/bibo/ @@ -247,6 +267,16 @@ + + + + + + + + + + @@ -255,11 +285,6 @@ http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - - - - - stable @@ -274,22 +299,27 @@ Encompasses talk, speech, lecture, slide lecture, conference presentation + + + + + + + + + + - - - 1 - - Smaller administrative division into which a country may be divided. @@ -299,12 +329,6 @@ - - - - - - @@ -327,24 +351,30 @@ - - + - + + + + + + + + - + + - - + @@ -376,10 +406,10 @@ http://www.fao.org/termportal/contr/fr/ FAO terminology - + - 1 - + + 2010-06-24 @@ -394,11 +424,6 @@ http://www.fao.org/termportal/contr/es/ http://www.fao.org/termportal/contr/ar/ - - - 1 - - @@ -413,16 +438,21 @@ - - - + + + Audiovisual recording in video format + + + + + Short Definition from the bibo ontology @@ -432,14 +462,19 @@ http://purl.org/ontology/bibo/ something that is printed or published and distributed, esp. a given number of a periodical - + + - - + + + + 1 + + @@ -474,11 +509,6 @@ UN Statistics Division - - - 1 - - http://faostat.fao.org http://faostat.fao.org @@ -489,25 +519,40 @@ http://faostat.fao.org/default.aspx?lang=es FAOSTAT http://faostat.fao.org - - + + + - + + + + + + + + + + + + + 1 + + Currently being used by a restriction on organization. - + + 1 - - + @@ -543,10 +588,10 @@ http://www.iso.org/iso/fr/country_codes/iso_3166_code_lists.htm - + Authorship of journal articles, books and other original works is a means by which academics communicate the results of their scholarly work, establish priority for their discoveries, and build their reputation among their peers. This class allows for linking an author to a publication while indicating information about that author's authorship. Contains the authors name, their rank in the publication, and whether or not they are a corresponding author on the publication. @@ -560,10 +605,20 @@ This class allows for linking an author to a publication while indicating inform Bibo Definition: A seminar, discussion group, or the like, that emphasizes exchange of ideas and the demonstration and application of techniques, skills, etc. - + + - + + + + + + + + + + @@ -574,11 +629,6 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ - - - 1 - - aka movie. http://purl.org/ontology/bibo/ @@ -588,11 +638,11 @@ This class allows for linking an author to a publication while indicating inform stable + + Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio Independent organizations formally working together toward a common goal, under an expressed agreement - - @@ -601,16 +651,31 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + + + + - - A group of related documents issued at regular intervals. - - http://purl.org/ontology/bibo/ stable + + + + + 1 + + + + + + @@ -647,26 +712,26 @@ This class allows for linking an author to a publication while indicating inform Short Definition take from http://en.wiktionary.org/wiki/continent. + + + 1 + + + + + + + + + + + + - - - - - - - - 1 - - - - - - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/en/ @@ -686,11 +751,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - This is done through a restriction on the foaf:Person class. @@ -717,15 +777,25 @@ This class allows for linking an author to a publication while indicating inform + + + + + + + + + + + + + 1 + + - - - - - This is done through a restriction on academic degree to allow the values from to be foaf:organization to be used as the range. @@ -733,6 +803,11 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + FAO terminology http://www.fao.org/termportal/contr/es/ @@ -771,20 +846,10 @@ This class allows for linking an author to a publication while indicating inform - + + + - 1 - - - - - 1 - - - - - - A unit devoted primarily to extension activities, whether for outreach or research. @@ -812,14 +877,9 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - + + + @@ -830,17 +890,17 @@ This class allows for linking an author to a publication while indicating inform A legal decision that affirms a ruling. - - - 1 - - + + + 1 + + Something designed, built, installed, etc., to serve a specific function or activity affording a convenience or service. Distinct from the organization that runs it; e.g., a laboratory may be an organization but may be run by another organization and only consist of facilities housing equipment or services. Can be a building or place that provides a particular service or is used for a particular activity. Use the specific Building or Room whenever possible. Short definition from http://dictionary.reference.com/browse/facility. @@ -848,30 +908,30 @@ This class allows for linking an author to a publication while indicating inform Use subclasses of core:Facility subclasses instead of this class if possible + + + + + A gathering of people for a defined purpose, not necessarily public or announced - + + + + + + + + 1 + + + 1 - - - - - - - - - - 1 - - - - - - + @@ -888,11 +948,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - @@ -918,6 +973,11 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/es/ + + + 1 + + @@ -925,11 +985,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - @@ -940,10 +995,15 @@ This class allows for linking an author to a publication while indicating inform Either city or town - a thickly populated area having fixed boundaries and certain local powers of government. - + + + - 1 - + + + + + @@ -955,21 +1015,26 @@ This class allows for linking an author to a publication while indicating inform That is a position held by an academic faculty member who works for administration. + Associate Dean - - An academic administrative position (associate dean, etc.) as distinct from a professional administrative position (non-academic) + + + server; Bruker Vector-33 FT-IR - + A network server is one example. Medical schools and research laboratories can list professional equipment, such as microscopes. - - A physical object provided for specific purpose, task or occupation. + + + + + A description (often numeric) that locates an item within a containing document or collection. @@ -978,30 +1043,25 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ - - - - - + http://purl.org/ontology/bibo/ A specific journal article + + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a periodical or book Short Definition modified from the bibo ontology. - A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine. - - stable - Director of Admissions and Placement; Associate University Librarian - Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. + + An employment activity, whether compensated or not. Short definition comes from http://en.wikipedia.org/wiki/Position, and has been modified. @@ -1015,20 +1075,10 @@ This class allows for linking an author to a publication while indicating inform - + 1 - - - - - - - - - - - + @@ -1040,16 +1090,11 @@ This class allows for linking an author to a publication while indicating inform The source of the public description and this info is found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html. Bibo considers this term "unstable". The bibo editorial note is: "We are not defining, using an enumeration, the range of the bibo:degree to the defined list of bibo:ThesisDegree. We won't do it because we want people to be able to define new degress if needed by some special usecases. Creating such an enumeration would restrict this to happen." - - - - - An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials - + @@ -1063,20 +1108,15 @@ This class allows for linking an author to a publication while indicating inform - - - + + + - - - - - Relates a document to an event; for example, a paper to a conference. @@ -1100,6 +1140,11 @@ This class allows for linking an author to a publication while indicating inform 2009-04-30 http://faostat.fao.org/DesktopDefault.aspx?PageID=377&lang=es#ancor + + + 1 + + Public Definition source (http://www.answers.com/topic/publisher). @@ -1111,15 +1156,15 @@ This class allows for linking an author to a publication while indicating inform - + + + - - - + - - + 1 + @@ -1133,15 +1178,15 @@ This class allows for linking an author to a publication while indicating inform - + - + - + - - + + @@ -1154,25 +1199,20 @@ This class allows for linking an author to a publication while indicating inform http://faostat.fao.org/DesktopDefault.aspx?PageID=550&lang=es#ancor 2009-09-21 - - - - - US Patent Data; US Job Data A named collection of data, usually containing only one type of data - + - - + + - Computer program and its related documentation; directs the operation of a computer + @@ -1192,8 +1232,13 @@ This class allows for linking an author to a publication while indicating inform - - + 1 + + + + + + http://purl.org/ontology/bibo/ @@ -1214,10 +1259,15 @@ This class allows for linking an author to a publication while indicating inform - + + + - - + + + + 1 + http://www.fao.org/termportal/contr/es/ @@ -1259,6 +1309,11 @@ This class allows for linking an author to a publication while indicating inform 020530902X + + + + + Member of the International Conference on Complex Systems Organizing Committee @@ -1270,30 +1325,20 @@ This class allows for linking an author to a publication while indicating inform Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - - - - - - - - - - - - - - - - - - + + 1 + + + + + 1 + + + + - @@ -1313,22 +1358,37 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 FAO terminology - + + + - + + + + + + + + + - + stable A scholarly academic article, typically published in a journal. http://purl.org/ontology/bibo/ Written by scholars for other scholars, typically published in an academic journal with an abstract and bibliography - + A specific academic journal article + + + + + @@ -1340,15 +1400,10 @@ This class allows for linking an author to a publication while indicating inform - + - - - - - - - + 1 + @@ -1356,10 +1411,15 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ Digital Object Identifier - - + - + 1 + + + + + + @@ -1369,6 +1429,11 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ + + + + + http://www.un.org/Depts/Cartographic/english/htmain.htm http://www.un.org/Depts/Cartographic/english/htmain.htm @@ -1380,17 +1445,22 @@ This class allows for linking an author to a publication while indicating inform http://www.un.org/Depts/Cartographic/french/htmain.htm UN Cartographic Section + + + 1 + + + + + + + - - - - - http://purl.org/dc/terms/ http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html @@ -1399,6 +1469,11 @@ This class allows for linking an author to a publication while indicating inform A summary of the resource. stable + + + + + Role of a person designated by a grantee to direct a project or activity being supported by a grant, and who is accountable to the grantee for the proper conduct of the project or activity. Also known as Program Director or Project Director. @@ -1424,11 +1499,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/en/ - - - - - http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -1442,6 +1512,11 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/es/ + + + + + @@ -1458,16 +1533,6 @@ This class allows for linking an author to a publication while indicating inform - - 1 - - - - - - 1 - - Bibo has the domain of bibo:issue as the class Issue, but an example on their site uses it with Article, referring to the issue number "4" @@ -1475,11 +1540,11 @@ This class allows for linking an author to a publication while indicating inform - Definition taken from: http://en.wikipedia.org/wiki/University University of Florida; Washington University in St. Louis + An institution of higher education and research, which grants academic degrees in a variety of subjects, and provides both undergraduate education and postgraduate education. @@ -1488,54 +1553,70 @@ This class allows for linking an author to a publication while indicating inform Definition from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html + + + 1 + + Top level of all location classes. It's anticipated that the subclasses will be used when classifying items. And, all locations can be viewable via this class. Use subclasses of core:Location when classsifying items. - + - - + 1 + + + + + + + + + + + - - + A document created as a basis for discussion or a very early draft of a formal paper + - - + - - - - - 1 - + + - - - 1 - - Used for a single narrative summary of teaching, typically covering a wide range of courses including for credit and non-credit teaching over multiple semesters; the "teaches" property links a person directly with an instance of a Semester Class, typically from an institutional database of record; then use Teacher Role for information about a person's role in non-credit teaching or their specific contribution to individual courses + + + + + + + + + 1 + + source: http://en.wikipedia.org/wiki/Issn @@ -1551,11 +1632,6 @@ This class allows for linking an author to a publication while indicating inform source of definition: http://www.uspto.gov/main/glossary/#p . The following site has patent number formats: http://www.uspto.gov/patents/ebc/kindcodesum.jsp . - - - - - @@ -1564,10 +1640,10 @@ This class allows for linking an author to a publication while indicating inform - http://purl.org/ontology/bibo/ + Articles usually contain abstracts and bibliographies. Includes peer-reviewed, non-peer-reviewed, and open access journals. Journals are usually indexed in the major academic databases such as PubMed and Web of Science. stable A periodical of scholarly journal Articles. @@ -1583,10 +1659,20 @@ This class allows for linking an author to a publication while indicating inform Contains news articles, opinions, features, advertising, and is usually issued daily or weekly + + + + + + + + + + http://www.fao.org/termportal/contr/es/ http://www.fao.org/termportal/contr/zh/ @@ -1600,25 +1686,20 @@ This class allows for linking an author to a publication while indicating inform FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/fr/ - - - 1 - - - - - - - - + + + + + - + + @@ -1632,16 +1713,11 @@ This class allows for linking an author to a publication while indicating inform - - - - - - Wiley Prize in Biomedical Sciences An Award or Honor + An Award or Honor @@ -1657,10 +1733,21 @@ This class allows for linking an author to a publication while indicating inform - + - - + + + + + + + + + + + + + @@ -1671,21 +1758,21 @@ This class allows for linking an author to a publication while indicating inform An agent that receives a communication document. - - - - - + + + + Only use if no specific subclasses of core:EventSeries desribe the activity. - + A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. - - + + Two or more events that follow on one after the other or are connected one after the other. - - - + + + + Enter building name. If the building's name is a number (as in many governmental organizations such as national laboratories and military bases), then enter it. Do not confuse with the number that appears in a postal address. @@ -1699,11 +1786,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - @@ -1723,10 +1805,10 @@ This class allows for linking an author to a publication while indicating inform use one freetextKeyword assertion for each keyword or phrase. - + - - + + @@ -1734,29 +1816,14 @@ use one freetextKeyword assertion for each keyword or phrase. We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - - - - - - - - - - - + + + - 1 - - - - - 1 - @@ -1768,22 +1835,17 @@ We would like the range of core:outcome to be the union of Event and Process; an Represents educational training that has been received. This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree. - Currently any abstract name is given to individuals of this class. This could change in the future. + + - - + + A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue - - - - - - @@ -1792,10 +1854,10 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ - Facebook; VIVOweb.org; Flickr A group of Webpages accessible on the Web. A group of webpages available within a specific parent address or URL on the World Wide Web + unstable @@ -1813,21 +1875,16 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/zh/ - - - - - - - - + + + Work consisting of collections of previously published works - + Short Definition is the Medical Subject Heading (MeSH) definition A document that simultaneously contains other documents. http://purl.org/ontology/bibo/ @@ -1845,36 +1902,16 @@ We would like the range of core:outcome to be the union of Event and Process; an An area of corporate activity organized as an administrative or functional unit. Definition modified from http://www.thefreedictionary.com/division. It is difficult to tell the difference between a division and a department. - + Cardiovascular Medicine (division within medicine) - - - - - - - - 1 - - - - - - - The Ornithological Newsletter Usually issued periodically, prepared by or for a group or institution to present information to a specific audience, often also made available to the press and public - - - - - @@ -1883,33 +1920,28 @@ We would like the range of core:outcome to be the union of Event and Process; an VIVO Outreach Team; VIVO Ontology Team - + An informal organization brought together for the purposes of a project or event. - - - - - In the future we may be able to make this a defined class that would not need to be directly asserted, but the consensus seems to be that some organizations "are" clinical and some "are" research organizations and that the distinction is important enough to warrant the additional class and class assertions Any organization with a significant clinical function as a matter of course and not just through occasional clinical roles + + + + + A Cornell graduate field (http://vivo.cornell.edu/index.jsp?home=65535&collection=820) An ongoing academic initiative not formalized with department or division status. - - - - - @@ -1934,8 +1966,8 @@ We would like the range of core:outcome to be the union of Event and Process; an Alchohol Education Center; Center for Arts and Public Policy; Hearing Research Center - A place where a particular activity or service is concentrated. + Short Definition take from http://www.thefreedictionary.com/center. @@ -1953,16 +1985,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Indicates the precision of the value of a DateTimeValue instance. - - - 1 - - - - - 1 - - For example an HR job title for a person might be - Assistant University Librarian, and the preferred job title for that same person could be - Physical Sciences Librarian. @@ -1975,10 +1997,10 @@ We would like the range of core:outcome to be the union of Event and Process; an Short Definition from OCLC Input Standards, EntW A document created to summarize research findings associated with the completion of an academic degree. stable - - http://purl.org/ontology/bibo/ Works created to satisfy the requirements for an academic certification or degree; also called dissertation + + @@ -1988,22 +2010,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - - - UN Statistics Division @@ -2020,8 +2032,8 @@ We would like the range of core:outcome to be the union of Event and Process; an Only use if no specific subclasses of core:Role describe the role. - + A person's or organization's type of contribution to an endeavor Only use this broad role class if no subclasses of role describe the item being classified. @@ -2030,6 +2042,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -2046,11 +2063,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - @@ -2066,13 +2078,8 @@ We would like the range of core:outcome to be the union of Event and Process; an UN Cartographic Section UN Cartographic Section - - - - - - + A structured file of information or a set of logically related data stored and retrieved using computer-based means Short Definition is the Medical Subject Heading (MeSH) definition @@ -2085,20 +2092,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - 1 - - - - - - - - - - 1 - + + stable @@ -2109,7 +2106,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A meeting for consultation or discussion. - + @@ -2119,41 +2116,26 @@ We would like the range of core:outcome to be the union of Event and Process; an + A distinct, usually ongoing and specialized unit within a large organization. Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division. - Legal (department within a company); Use for any non-academic department - - - 1 - - - - - - - - - - 1 - - An online article or commentary appearing on a blog + A specific blog posting - Collection of documents or information resources that have a unified identity stable + Collection of documents or information resources that have a unified identity. Archives, museums and libraries often acquire collections on specific subjects and from distinguished authors or researchers. Also includes collections of resources bundled into a license. - http://purl.org/ontology/bibo/ Hill Ornithology Collection; Wiley Interscience Online Books Biochemisty Collection A collection of Documents or Collections @@ -2175,11 +2157,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition obtained here: http://answers.ask.com/Business/Finance/what_is_a_private_company. Examples of private companies found here: http://www.forbes.com/2008/11/03/largest-private-companies-biz-privates08-cx_sr_1103private_land.html - - - - - @@ -2189,9 +2166,9 @@ We would like the range of core:outcome to be the union of Event and Process; an B.A. Bachelor of Arts This list may have multiple abbreviations for some degrees. - An academic degree at any level, both as reported by individuals for employment and as offered by academic degree programs. - + + @@ -2216,11 +2193,6 @@ We would like the range of core:outcome to be the union of Event and Process; an One of a number of areas or communities having their own governments and forming a federation under a sovereign government, as in the US. - - - 1 - - http://purl.org/ontology/bibo/ @@ -2243,10 +2215,10 @@ We would like the range of core:outcome to be the union of Event and Process; an + phonograph record; tape; CD; DVD; DAT - An audio document; aka record. http://purl.org/ontology/bibo/ stable @@ -2273,26 +2245,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ - - - - - - - - 1 - - - - - - - - - - - - FAO terminology @@ -2306,20 +2258,15 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ 2010-06-24 - - - - - http://purl.org/ontology/bibo/ film; video; Blu-ray Audiovisual recording in any format - stable An audio-visual document; film, video, and so forth. + @@ -2356,11 +2303,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://xmlns.com/foaf/spec/#term_lastName. Note from foaf: "The lastName property is provided (alongside firstName) as a mechanism to support legacy data that cannot be easily interpreted in terms of the (otherwise preferred) familyName and givenName properties. The concepts of 'first' and 'last' names do not work well across cultural and linguistic boundaries; however they are widely used in addressbooks and databases." - - - - - @@ -2370,6 +2312,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + UN cartographic maps (http://www.un.org/Depts/Cartographic/map/profile/world.pdf) @@ -2394,6 +2341,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -2402,52 +2354,37 @@ We would like the range of core:outcome to be the union of Event and Process; an - + A defined class of organizations that fund Grants. National Institute of Health (NIH) - - - - - - - - 1 - - - - - 1 - - Definition found here: http://dictionary.reference.com/browse/publisher A person or company whose business is the publishing of books, periodicals, engravings, computer software, etc. - Elsevier; Harper & Row; Indiana University Press - - - - - + - + + + + + + + + - - A student organization is an organization, operated by students at a university, whose membership normally consists only of students. @@ -2461,6 +2398,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Afghanistan; Antigua and Barbuda; Cameroon; Iceland; Jamaica; Nigeria; United States of America + + + 1 + + @@ -2469,25 +2411,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - 1 - - - - - 1 - - - - - - - - - - 1 - + + @@ -2512,9 +2439,9 @@ We would like the range of core:outcome to be the union of Event and Process; an The full URL. Uniform Resource Locator (URL) specifies where an identified resource is available and the mechanism for retrieving it. + http://info.slis.indiana.edu/~katy/ - @@ -2534,10 +2461,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + 1 + + + + + + @@ -2547,15 +2479,15 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable - + - - + + - - - + + + http://www.fao.org/termportal/contr/ar/ @@ -2577,10 +2509,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + 1 - + @@ -2597,6 +2529,21 @@ We would like the range of core:outcome to be the union of Event and Process; an Public Definition source (http://www.answers.com/topic/publisher). + + + + + + + + 1 + + + + + + + An Institute normally has a research focus but may also fulfill instructional or outreach roles. @@ -2604,20 +2551,25 @@ We would like the range of core:outcome to be the union of Event and Process; an Institute for Fundamental Theory - - + This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. - - Only use if no specific subclasses of foaf:organization desribe the organization. A generic class encompassing several types of organizations. + + + + - - - + + Ued to describe an organization related to bibliographic items such as a publishing company, etc. + + + 1 + + http://www.fao.org/termportal/contr/fr/ http://www.fao.org/termportal/contr/es/ @@ -2650,27 +2602,47 @@ We would like the range of core:outcome to be the union of Event and Process; an definition modified from: source (http://en.wikipedia.org/wiki/Seating_capacity). 55 - + - - + + - + + + + + + + + 1 + + + 1 - + The digital file (or physical equivalent), if available after the conference, vs. the act of attending/presenting: use ConferencePresentation for information about date/time/location/name of the event where the poster was presented + + + + + An organized series of workshop events, whether repetitions of the same workshop or multiple different workshops. Use workshop for individual events. + + + + + @@ -2682,40 +2654,35 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - - + Only use if no specific subclasses of event:Event are appropriate. + + This class will also display instances of subclasses under Event, e.g. Philosophy Department Discussion Club; 2009 Racker Lecture; screening of a documentary. In addition to a location in space and time, an event may have any or all the following qualities: actively participating agents, passive factors, work products. Also, it may be in a virtual space or part of a series such as a lecture series. The previous short definition was: "An arbitrary classification of a space/time region, by a cognitive agent." + + + + + Something that happens at a given place and time. - - - - - - - - + + + + - + - 1 - + + @@ -2738,20 +2705,15 @@ The previous short definition was: "An arbitrary classification of a space/time http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - + + + - + 1 - - - - - 1 - + @@ -2776,10 +2738,10 @@ The previous short definition was: "An arbitrary classification of a space/time - + 1 - + @@ -2788,10 +2750,10 @@ The previous short definition was: "An arbitrary classification of a space/time - + + - - + @@ -2799,14 +2761,19 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + - + An award, honor, or distinction received by a person on a particular date (not the award itself as given repeatedly, and not a grant award). A specific award on a particular date or for a particular date range. - + Ninth annual Wiley Prize in Biomedical Sciences, for the discovery of a light activated ion channel - + @@ -2815,6 +2782,11 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + Short Definition from the bibo ontology http://purl.org/ontology/bibo/ @@ -2836,30 +2808,25 @@ The previous short definition was: "An arbitrary classification of a space/time Role of co-principal investigator of a grant, who devotes a specified percentage of time and is considered key personnel. - + + - 1 - + - + 1 - + - + Professor, associate professor and assistant professor are common positions for academic faculty. Professor; Associate Professor; Assistant Professor + Academic position in a university or institution - - - - 1 - - stable @@ -2868,21 +2835,36 @@ The previous short definition was: "An arbitrary classification of a space/time http://en.wikipedia.org/wiki/Global_Trade_Item_Number. Global Trade Item Number 14 + + + + + The dual relationship of a professor advising a student and the student being advised by a professor, typically including start and end dates - + - + + + - - - + - 1 - + + + + + + + + + + + + @@ -2894,6 +2876,11 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + @@ -2915,16 +2902,16 @@ modern society using the world of Star trek. Los Angeles Times, March An section number + + + 1 + + - - - 1 - - http://www.fao.org/termportal/contr/en/ http://www.fao.org/termportal/contr/es/ @@ -2955,9 +2942,24 @@ modern society using the world of Star trek. Los Angeles Times, March + + + + + + + + + + + + + 1 + + @@ -2966,14 +2968,19 @@ modern society using the world of Star trek. Los Angeles Times, March http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet + + + + + a specific period or duration, defined by (optional) start and end date/times. - + 1 - + @@ -2991,15 +2998,15 @@ modern society using the world of Star trek. Los Angeles Times, March Short Definition from bibo ontology - + - 1 - + + - + - - + + @@ -3042,16 +3049,6 @@ modern society using the world of Star trek. Los Angeles Times, March - - - - - - - - - - @@ -3064,11 +3061,6 @@ source: http://en.wikipedia.org/wiki/ORCID . - - - 1 - - Used to link a bibliographic item to its publisher. @@ -3094,10 +3086,20 @@ Examples of a Publisher include a person, an organization, or a service. Typical + + + + + + + + + + academic disciplines or more detailed research area a subject, an academic field, a research area, or a discipline. SC. @@ -3113,6 +3115,11 @@ Examples of a Publisher include a person, an organization, or a service. Typical A presentation of a series of slides, usually presented in front of an audience with written text and images. stable + + + + + @@ -3158,23 +3165,13 @@ Examples of a Publisher include a person, an organization, or a service. Typical 2010-06-24 - - - - - Resource dependent on other entities This class is here so it can be equivalent to vitro:DependentResource. Deletion in the VIVO system behaves differently when deleting members of this class: related individuals may need to be deleted as well. - - - - - - + @@ -3182,11 +3179,16 @@ Examples of a Publisher include a person, an organization, or a service. Typical A distinct, usually specialized educational unit within an educational organization. - + - + Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts) + + + + + @@ -3194,11 +3196,6 @@ Examples of a Publisher include a person, an organization, or a service. Typical RearcherID is a Thomson Reuters project where researchers have a place to manage and share their professional information. It will allow them to solve author identity issues while simultaneously adding dynamic citation metrics and collaboration networks to your personal profile. Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - @@ -3226,22 +3223,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/Critical or explanatory note for a Document. - - - - - - - + + + + An intramural or extramural award to support scholarly work, such as UF09179 (VIVO) Short definition is from the Glossary of NIH Terms. - - Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity - + @@ -3305,10 +3297,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/2010-06-24 http://www.fao.org/termportal/en/ - + - - + 1 + Universal Product Code @@ -3324,11 +3316,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3336,21 +3323,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/Intel Talent Search; poetry contest Not the same as an award or distinction. - + - - + 1 + A proposal for a research grant that has been submitted but not approved; does not represent an existing activity - - - 1 - - @@ -3360,11 +3342,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable - - - - - @@ -3387,11 +3364,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ 0.7 - - - - - http://purl.org/ontology/bibo/ New Yorker @@ -3405,17 +3377,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Address has properties for department name, street, city, state or province, postal code, and country. For US specific address, classify using core:US Postal Code. core:Address will display all addresses. - + University of Waterloo, 200 University Avenue West, Waterloo, Ontario, Canada N2L 3G1 A code and abstract concept expressing a location on the Earth's surface. To classify US specific addresses, use core:US Postal Code. - Librarian; Library Systems Analyst; Music Bibliographer It is the common position in libraries. + A position held by library and information science professionals, or academic or technical experts, in support of providing information services or materials - + @@ -3431,6 +3403,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/es/ + + + 1 + + @@ -3451,11 +3428,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/Library of Congress Control Number Source: http://en.wikipedia.org/wiki/Library_of_Congress_Control_Number. - - - - - @@ -3463,17 +3435,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + A group can also be an organization but need not be; typically used for looser associations of people or organizations acting together in some fashion, not necessarily through formal agreement or on a long-term basis. Added to the VIVO ontology to be able to support informal and perhaps even private groups of people around an idea, funding opportunity, or event. A group of agents - - - 1 - - http://purl.org/ontology/bibo/ unstable @@ -3482,12 +3454,22 @@ Definition source: http://isiwebofknowledge.com/researcherid/A chapter of a book. A main division of a book + + + + 2 + + + + + + Curriculum Steering Committee; PhD Advisory Committee - A group of people organized for a specific purpose (e.g., a reporting or advisory role), often with a charge and for a specific duration. + There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important. @@ -3499,11 +3481,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - stable A legal document; for example, a court decision, a brief, and so forth. @@ -3523,28 +3500,33 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + + - - - - - 1 - This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. + + + + + + + + + + - - 1320 East 10th Street, Wells Library 021 Bloomington, IN 47405 - + + Formal address in US postal address system. + US postal address follow the format street, apt or office number (optional), city, state, and zipcode. @@ -3558,15 +3540,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + 1 - + - + - - + + @@ -3581,17 +3563,22 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print. + + + + + - - - + Short Definition from the bibo ontology unstable - + A section of a book + http://purl.org/ontology/bibo/ + A section of a book. @@ -3605,15 +3592,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - - - - - - + + @@ -3629,16 +3611,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - + + + - - - - - radio or newspaper interview @@ -3648,6 +3625,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable + + + + + @@ -3655,10 +3637,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + 1 - + Definition was take from here: http://dictionary.reference.com/browse/museum @@ -3667,6 +3649,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/The Getty Museum A building or place where works of art, scientific specimens, or other objects of permanent value are kept and displayed. + + + + + unstable http://purl.org/ontology/bibo/ @@ -3675,17 +3662,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - Indiana; Florida; Minnesota; Michigan; New York; Quebec; Manitoba; Ontario + + + + + FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -3705,15 +3692,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - + + - + - - + 1 + @@ -3737,10 +3724,25 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - 1 - + + + + + + 1 + + + + + 1 + + + + + + @@ -3749,17 +3751,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ For example, National Science Foundation providesFundingThrough Graduate Research Fellowship Program; National Institutes of Health providesFundingThrough National Center for Research Resources. - - - 1 - - + + + + + A small reference book, especially one giving instructions. unstable @@ -3784,38 +3786,38 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - - - - - - + + + + + + + + 1 + + A short form for an longer title or name. B.A. + + + 1 + + A person holding a position that is not considered to be an academic appointment. - - - 1 - - @@ -3828,10 +3830,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - + 1 + @@ -3840,6 +3842,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + A location having coordinates in geographic space. @@ -3866,10 +3873,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - + 1 + @@ -3877,6 +3884,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + An agent that is interviewed by another agent. stable @@ -3892,17 +3904,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + Used for a single narrative summary of research, typically covering a wide range of activities and time periods; use Researcher Role for information on individual activities - - - - - A role involving research (funded or unfunded), sometimes linked to a grant @@ -3910,6 +3922,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Bacteria-resistant bandage; Termite prevention system; Hurricane resistant houses + + + + + Relates a document to some transcribed original. The bibo:transcriptOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers this term unstable. @@ -3924,11 +3941,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3938,6 +3950,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/Publication Description source http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . This term is also considered unstable. unstable + + + + + + + + + + @@ -3978,15 +4000,15 @@ bibo has the domain of this property set to the union of Collection and Document - + + + + + + 1 - - - - - - + @@ -4014,15 +4036,25 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/ar/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - + + + 1 + + + + + + + + + + http://purl.org/ontology/bibo/ @@ -4031,41 +4063,46 @@ bibo has the domain of this property set to the union of Collection and Document - - - 1 - - - - + - + + + + + 1 + + + + + + + + + + 1 + + - - - - - @@ -4092,6 +4129,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + http://www.fao.org/termportal/contr/es/ @@ -4123,29 +4165,24 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - - A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate - - + + + Short Definition from the bibo ontology - stable - http://purl.org/ontology/bibo/ - + A document (noun) is a bounded physical representation of body of information designed with the capacity (and usually intent) to communicate. A document may manifest symbolic, diagrammatic or sensory-representational information. + + A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate @@ -4213,28 +4250,53 @@ bibo has the domain of this property set to the union of Collection and Document The Uniform Code Council (UCC) was the Numbering Organization in the USA to administer and manage the EAN.UCC System. In 2005 the UCC changed its name to GS1 US. European Article Number/Uniform Commercier Code 13 + + + + + + + + + + Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. + + + 1 + + An edited book. http://purl.org/ontology/bibo/ + Best American Science Writing 2009 stable - An edited collection of stand-alone articles published as a book - - - + + + - + - - + + + + + + 1 + + + + + + Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible. @@ -4243,22 +4305,12 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Short definition obtained here: http://en.wiktionary.org/wiki/geopolitical_entity. - - - - - - - - - - 100 Caldwell Hall; 114 Martha Van Rensselaer (Rushmore Conference Room) Room that provides a particular service or is used for a particular activity. @@ -4266,44 +4318,59 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Enter room number of name. + + + + + + + + 1 + + + + + + + - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + + + - - + - + + + + + + @@ -4311,10 +4378,15 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Medicine - + - - + 1 + + + + + 1 + http://www.fao.org/termportal/en/ @@ -4334,10 +4406,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Examples shows a book has French language version. Public description source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - + - - + 1 + @@ -4346,10 +4418,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - + + + @@ -4368,23 +4440,28 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi College of Arts & Sciences; Ivy Tech Community College A primary academic unit within a University or a free-standing higher education organization without graduate degree programs. - + + + + + + Document1 isVersionOf Document2 This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - + + + - - - + + 1 + @@ -4410,20 +4487,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - 1 - - - - - - - - - - - + + @@ -4441,11 +4508,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Collection of legal cases stable - - - - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/en/ @@ -4459,21 +4521,46 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + 1 + + - + - - - + + + + + + + + + + + + + + + + + + + + + 1 + + @@ -4485,18 +4572,13 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://xmlns.com/foaf/spec/#term_firstName. Note from foaf: "The lastName property is provided (alongside firstName) as a mechanism to support legacy data that cannot be easily interpreted in terms of the (otherwise preferred) familyName and givenName properties. The concepts of 'first' and 'last' names do not work well across cultural and linguistic boundaries; however they are widely used in addressbooks and databases." - - - 1 - - - UITS service UITS service is the information technology services provided by Indiana University. SC. + A regularly offered service in support of an academic, research, or administrative function (not personal or professional service by an individual) - + @@ -4504,24 +4586,34 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + 1 + + + + + + + - - - - - Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. + + + 1 + + Cornell Ithaca; Cornell Geneva; Cornell New York City; Cornell Qatar @@ -4529,12 +4621,22 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi The grounds of a school, college, university, or hospital. Or, a large, usually suburban, landscaped business or industrial site. + + + + + + + + + + unstable @@ -4544,16 +4646,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ Short Definition from the bibo ontology - - - - - + + + 1 + + @@ -4570,20 +4672,25 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi A work consisting of texts of rules and regulations related to statutes issued by executive or administrative agencies A collection of statutes. + + + + + - An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support - - + + + + Used information from this definition: http://dictionary.reference.com/browse/library. - A collection of any materials, for study and enjoyment, which has been systematically arranged. Marston Science Library @@ -4601,16 +4708,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ - + - - - 1 - - http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -4642,10 +4744,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - + - - + + @@ -4658,10 +4760,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi full email address - + - 1 - + + @@ -4669,19 +4771,14 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - - - - - Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. - - - - - + + + + + @@ -4696,30 +4793,25 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + For data ingest from authoritative sources to record the actual way a person was listed as author, as potentially valuable information for author disambiguation. - - - 1 - - A person who has already received a bachelor's degree and is working toward a Master's or Doctoral degree. - - - 1 - - - - - + + + @@ -4742,17 +4834,17 @@ We would like the range of core:outcome to be the union of Event and Process; an Used to link a bibliographic item to one of its contributor: can be an author, an editor, a publisher, etc. - - - - - + + + + + @@ -4769,30 +4861,15 @@ We would like the range of core:outcome to be the union of Event and Process; an Any organization (likely also asserted as another class of Organization) with a primary, ongoing research function, not just through occasional roles - - - - - - - - - - - - - - - The result of rendering a work from one language to another - + + + - 1 - @@ -4812,16 +4889,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - - - - - - http://www.fao.org/figis/servlet/RefServlet http://www.fao.org/figis/servlet/RefServlet @@ -4835,20 +4902,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - Medical Subject Heading (MeSH) definition of Technical Report: Work consisting of a formal report giving details of the investigation and results of a medical or other scientific problem. When issued by a government agency or comparable official body, its contents may be classified, unclassified, or declassified with regard to security clearance. This publication type may also cover a scientific paper or article that records the current state or current position of scientific research and development. If so labeled by the editor or publisher, this publication type may be properly used for journal articles. A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc.. + http://purl.org/ontology/bibo/ A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc. stable - - - - - @@ -4880,25 +4942,20 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/fr/ - - - - - - - - - - - + + + - + + + + @@ -4909,15 +4966,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - - - - - - + + @@ -4925,21 +4977,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - 1 - - - - - - - @@ -4962,10 +4999,10 @@ We would like the range of core:outcome to be the union of Event and Process; an A person registered in an undergraduate program leading to a bachelor's degree or an undergraduate diploma or certificate. - + + - - + An excerpted collection of words @@ -4976,23 +5013,13 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ Short Definition from the bibo ontology - - - 1 - - - - - - - - + A position involving academic work but without faculty status + Researcher; Academic Extension Associate; Postdoctoral Associate - Those positions are held by people who do academic work but do not have faculty positions in universities or institutes. @@ -5012,6 +5039,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + The example is one outreach role required by US space agency NASA, which is related with one project in NASA. Name of the outreach role should be put here. @@ -5019,21 +5051,21 @@ We would like the range of core:outcome to be the union of Event and Process; an An outreach or community service role directed outside a person's primary profession and institution Communicating Astronomy to the Public - - - + + + stable + + A loose, thematic, collection of Documents, often Books. A thematic collection of documents, usually books, issued at regular or irregular intervals http://purl.org/ontology/bibo/ - Methods in Molecular Biology - @@ -5057,10 +5089,10 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal decision on appeal that takes action on a case (affirming it, reversing it, etc.). - + - - + + @@ -5082,25 +5114,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - 1 - - - - - - - - - - - - - - - - + + @@ -5115,14 +5132,24 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet + + + + + Short Definition modified from the one found here: http://www.thefreedictionary.com/county. - + Alachua; Baker; Bradford; Kenora; Ottawa; Waterloo The largest administrative division of most states or provinces. + + + + + Home page for Scopus: http://www.scopus.com/home.url @@ -5146,39 +5173,44 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - - + 1 + - - + - + 1 + + + + + + - - Short Definition from the bibo ontology A distinct part of a larger document or collected document - + http://purl.org/ontology/bibo/ a distinct part of a larger document or collected document. + + unstable - + + + Short Definition copied from bibo ontology - http://purl.org/ontology/bibo/ - + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers. - - + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers stable @@ -5189,16 +5221,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - - - - - 2 - @@ -5209,22 +5231,40 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - + + + + + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. + + + + + + + + + 1 + + + + + 1 + + - + + + - - @@ -5232,30 +5272,20 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + + - - + A URLLink that is designated (by the user or anyone else) as a primary link for the person, organization, event, etc. - - - 1 - - - - - - - A formal organization of people or organizations around a subject or practice. @@ -5270,10 +5300,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Note: Bibo:editor is used as the inverse of core:editorOf. Public Description for bibo:editor was obtained from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - + + + - - @@ -5286,20 +5316,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - - - - - - - + 1 - + @@ -5317,12 +5337,27 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + 1 + + + + + + + + + + + + http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/es/ @@ -5337,20 +5372,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik FAO terminology - - - - - - - - - - @@ -5366,15 +5391,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - + - - + - + 1 + @@ -5396,15 +5421,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/termportal/en/ 2010-06-24 - + - - + + - + - - + 1 + @@ -5425,21 +5450,16 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49alpha.htm - + - - - - - - - - - - - + + + + 1 + + paraphrased editorial note from the bibo ontology: We are not defining, using an enumeration, the range of the bibo:status to be a defined list of bibo:DocumentStatus. This is because we want people to be able to define new statuses if needed; and creating such an enumeration would prevent this. @@ -5448,11 +5468,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A list of items in a collection; an ordered compilation of item descriptions and sufficient information to afford access to them + - + NLM Catalog Short Definition is the Medical Subject Heading (MeSH) definition - diff --git a/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf b/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf index e6254768..9c625128 100644 --- a/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf +++ b/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf @@ -357,11 +357,11 @@ - - + true + product 5 - true + @@ -2736,6 +2736,17 @@ + + true + + + + produces + true + Select a publication, patent or other type of information resource that has been produced as a result of this endeavor. + 5 + 40 + 1 @@ -2977,6 +2988,11 @@ true current member of + + product of + 5 + 40 + -1 -1 diff --git a/productMods/WEB-INF/submodels/scires-1.2.owl b/productMods/WEB-INF/submodels/scires-1.2.owl index 62782ca0..53e0b6ab 100644 --- a/productMods/WEB-INF/submodels/scires-1.2.owl +++ b/productMods/WEB-INF/submodels/scires-1.2.owl @@ -21,11 +21,6 @@ - - - - - @@ -33,9 +28,9 @@ + An implement used to facilitate work, especially precision work. An implement used to facilitate work, especially precision work. - @@ -115,17 +110,17 @@ NOTE that we are not addressing for now the issue of whether a foaf:Person is a eagle-i: Research project that uses or collects measurements or assessments about humans. + + + + Every clinical trial in the United States must be approved and monitored by an Institutional Review Board (IRB). An IRB is an independent committee of physicians, statisticians, community advocates and others whose objective is to ensure that a clinical trial is ethical and the rights of study participants are protected. + A portion or quantity of a biological material for use in testing, examination, or study. eagle-i: Material entity that is a portion or quantity of a biological material for use in testing, examination, or study. A biological specimen can be an individual animal, part of or derived an animal, plant, part of a plant, or microorganism. When a taxon is described, it is typically based on a single specimen and is referred to as the holotype. An individual animal, part of or derived an animal, plant, part of a plant, or microorganism. - - - - Every clinical trial in the United States must be approved and monitored by an Institutional Review Board (IRB). An IRB is an independent committee of physicians, statisticians, community advocates and others whose objective is to ensure that a clinical trial is ethical and the rights of study participants are protected. - In Phase 3 trials, an experimental study drug or treatment is given to large groups of people (1,000-3,000) to confirm its effectiveness, monitor side effects, compare it to commonly used treatments, and collect information that will allow the experimental drug or treatment to be used safely. @@ -139,6 +134,11 @@ NOTE: For now we are not addressing whether this is a subclass of foaf:AgentMaterial entity that is used in a chemical reaction or other experimental process to detect, measure, examine, or produce other substances. + + + + + diff --git a/productMods/WEB-INF/submodels/vivo-core-1.2.owl b/productMods/WEB-INF/submodels/vivo-core-1.2.owl index dcd70273..1716bfa3 100644 --- a/productMods/WEB-INF/submodels/vivo-core-1.2.owl +++ b/productMods/WEB-INF/submodels/vivo-core-1.2.owl @@ -25,6 +25,11 @@ A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available in PubMed Central. The PMCID is issued shortly after the PI or author approves the PubMed Central formatted web version of the submission. + + + + + http://purl.org/ontology/bibo/ Short Definition from bibo ontology @@ -49,6 +54,16 @@ + + + + + + + + + + @@ -62,11 +77,6 @@ An organized series of a meeting for an exchange of ideas, typically put on by a department or center. - - - 1 - - @@ -93,12 +103,12 @@ - + UN Cartographic Section UN Cartographic Section - + - + @@ -106,18 +116,38 @@ + + + + + + + + + + + + + + + + + + + + Accounting & Research Services Assistant; Director of Information Technology Staff, support, and other non-academic positions. + A position classified as professional, staff, support, or any other non-academic role - - + @@ -132,16 +162,6 @@ Serial Item and Contribution Identifier - - - 1 - - - - - - - @@ -151,11 +171,6 @@ - - - - - Definition take from: http://en.wikipedia.org/wiki/Government_agency. United States Library of Congress @@ -173,6 +188,11 @@ + + + + + @@ -204,30 +224,30 @@ Definition take from: http://xmlns.com/foaf/spec/#term_based_near . foaf indicates that the status of this term is "unstable". "The based_near relationship relates two "spatial things" (anything that can be somewhere), the latter typically described using the geo:lat / geo:long geo-positioning vocabulary (http://www.w3.org/2003/01/geo/wgs84_pos#). This allows us to say describe the typical latitute and longitude of, say, a Person (people are spatial things - they can be places) without implying that a precise location has been given." Used to link an agent, related to bibliographic things, to a place where it is based near: can be a city, a monument, a building, etc. + + + + + Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - - - The most general classification of a person - + The most general classification of a person - + + + + + + - - - 1 - - http://purl.org/ontology/bibo/ @@ -247,6 +267,16 @@ + + + + + + + + + + @@ -255,11 +285,6 @@ http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - - - - - stable @@ -274,22 +299,27 @@ Encompasses talk, speech, lecture, slide lecture, conference presentation + + + + + + + + + + - - - 1 - - Smaller administrative division into which a country may be divided. @@ -299,12 +329,6 @@ - - - - - - @@ -327,24 +351,30 @@ - - + - + + + + + + + + - + + - - + @@ -376,10 +406,10 @@ http://www.fao.org/termportal/contr/fr/ FAO terminology - + - 1 - + + 2010-06-24 @@ -394,11 +424,6 @@ http://www.fao.org/termportal/contr/es/ http://www.fao.org/termportal/contr/ar/ - - - 1 - - @@ -413,16 +438,21 @@ - - - + + + Audiovisual recording in video format + + + + + Short Definition from the bibo ontology @@ -432,14 +462,19 @@ http://purl.org/ontology/bibo/ something that is printed or published and distributed, esp. a given number of a periodical - + + - - + + + + 1 + + @@ -474,11 +509,6 @@ UN Statistics Division - - - 1 - - http://faostat.fao.org http://faostat.fao.org @@ -489,25 +519,40 @@ http://faostat.fao.org/default.aspx?lang=es FAOSTAT http://faostat.fao.org - - + + + - + + + + + + + + + + + + + 1 + + Currently being used by a restriction on organization. - + + 1 - - + @@ -543,10 +588,10 @@ http://www.iso.org/iso/fr/country_codes/iso_3166_code_lists.htm - + Authorship of journal articles, books and other original works is a means by which academics communicate the results of their scholarly work, establish priority for their discoveries, and build their reputation among their peers. This class allows for linking an author to a publication while indicating information about that author's authorship. Contains the authors name, their rank in the publication, and whether or not they are a corresponding author on the publication. @@ -560,10 +605,20 @@ This class allows for linking an author to a publication while indicating inform Bibo Definition: A seminar, discussion group, or the like, that emphasizes exchange of ideas and the demonstration and application of techniques, skills, etc. - + + - + + + + + + + + + + @@ -574,11 +629,6 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ - - - 1 - - aka movie. http://purl.org/ontology/bibo/ @@ -588,11 +638,11 @@ This class allows for linking an author to a publication while indicating inform stable + + Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio Independent organizations formally working together toward a common goal, under an expressed agreement - - @@ -601,16 +651,31 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + + + + - - A group of related documents issued at regular intervals. - - http://purl.org/ontology/bibo/ stable + + + + + 1 + + + + + + @@ -647,26 +712,26 @@ This class allows for linking an author to a publication while indicating inform Short Definition take from http://en.wiktionary.org/wiki/continent. + + + 1 + + + + + + + + + + + + - - - - - - - - 1 - - - - - - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/en/ @@ -686,11 +751,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - This is done through a restriction on the foaf:Person class. @@ -717,15 +777,25 @@ This class allows for linking an author to a publication while indicating inform + + + + + + + + + + + + + 1 + + - - - - - This is done through a restriction on academic degree to allow the values from to be foaf:organization to be used as the range. @@ -733,6 +803,11 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + FAO terminology http://www.fao.org/termportal/contr/es/ @@ -771,20 +846,10 @@ This class allows for linking an author to a publication while indicating inform - + + + - 1 - - - - - 1 - - - - - - A unit devoted primarily to extension activities, whether for outreach or research. @@ -812,14 +877,9 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - + + + @@ -830,17 +890,17 @@ This class allows for linking an author to a publication while indicating inform A legal decision that affirms a ruling. - - - 1 - - + + + 1 + + Something designed, built, installed, etc., to serve a specific function or activity affording a convenience or service. Distinct from the organization that runs it; e.g., a laboratory may be an organization but may be run by another organization and only consist of facilities housing equipment or services. Can be a building or place that provides a particular service or is used for a particular activity. Use the specific Building or Room whenever possible. Short definition from http://dictionary.reference.com/browse/facility. @@ -848,30 +908,30 @@ This class allows for linking an author to a publication while indicating inform Use subclasses of core:Facility subclasses instead of this class if possible + + + + + A gathering of people for a defined purpose, not necessarily public or announced - + + + + + + + + 1 + + + 1 - - - - - - - - - - 1 - - - - - - + @@ -888,11 +948,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - @@ -918,6 +973,11 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/es/ + + + 1 + + @@ -925,11 +985,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - @@ -940,10 +995,15 @@ This class allows for linking an author to a publication while indicating inform Either city or town - a thickly populated area having fixed boundaries and certain local powers of government. - + + + - 1 - + + + + + @@ -955,21 +1015,26 @@ This class allows for linking an author to a publication while indicating inform That is a position held by an academic faculty member who works for administration. + Associate Dean - - An academic administrative position (associate dean, etc.) as distinct from a professional administrative position (non-academic) + + + server; Bruker Vector-33 FT-IR - + A network server is one example. Medical schools and research laboratories can list professional equipment, such as microscopes. - - A physical object provided for specific purpose, task or occupation. + + + + + A description (often numeric) that locates an item within a containing document or collection. @@ -978,30 +1043,25 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ - - - - - + http://purl.org/ontology/bibo/ A specific journal article + + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a periodical or book Short Definition modified from the bibo ontology. - A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine. - - stable - Director of Admissions and Placement; Associate University Librarian - Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. + + An employment activity, whether compensated or not. Short definition comes from http://en.wikipedia.org/wiki/Position, and has been modified. @@ -1015,20 +1075,10 @@ This class allows for linking an author to a publication while indicating inform - + 1 - - - - - - - - - - - + @@ -1040,16 +1090,11 @@ This class allows for linking an author to a publication while indicating inform The source of the public description and this info is found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html. Bibo considers this term "unstable". The bibo editorial note is: "We are not defining, using an enumeration, the range of the bibo:degree to the defined list of bibo:ThesisDegree. We won't do it because we want people to be able to define new degress if needed by some special usecases. Creating such an enumeration would restrict this to happen." - - - - - An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials - + @@ -1063,20 +1108,15 @@ This class allows for linking an author to a publication while indicating inform - - - + + + - - - - - Relates a document to an event; for example, a paper to a conference. @@ -1100,6 +1140,11 @@ This class allows for linking an author to a publication while indicating inform 2009-04-30 http://faostat.fao.org/DesktopDefault.aspx?PageID=377&lang=es#ancor + + + 1 + + Public Definition source (http://www.answers.com/topic/publisher). @@ -1111,15 +1156,15 @@ This class allows for linking an author to a publication while indicating inform - + + + - - - + - - + 1 + @@ -1133,15 +1178,15 @@ This class allows for linking an author to a publication while indicating inform - + - + - + - - + + @@ -1154,25 +1199,20 @@ This class allows for linking an author to a publication while indicating inform http://faostat.fao.org/DesktopDefault.aspx?PageID=550&lang=es#ancor 2009-09-21 - - - - - US Patent Data; US Job Data A named collection of data, usually containing only one type of data - + - - + + - Computer program and its related documentation; directs the operation of a computer + @@ -1192,8 +1232,13 @@ This class allows for linking an author to a publication while indicating inform - - + 1 + + + + + + http://purl.org/ontology/bibo/ @@ -1214,10 +1259,15 @@ This class allows for linking an author to a publication while indicating inform - + + + - - + + + + 1 + http://www.fao.org/termportal/contr/es/ @@ -1259,6 +1309,11 @@ This class allows for linking an author to a publication while indicating inform 020530902X + + + + + Member of the International Conference on Complex Systems Organizing Committee @@ -1270,30 +1325,20 @@ This class allows for linking an author to a publication while indicating inform Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - - - - - - - - - - - - - - - - - - + + 1 + + + + + 1 + + + + - @@ -1313,22 +1358,37 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 FAO terminology - + + + - + + + + + + + + + - + stable A scholarly academic article, typically published in a journal. http://purl.org/ontology/bibo/ Written by scholars for other scholars, typically published in an academic journal with an abstract and bibliography - + A specific academic journal article + + + + + @@ -1340,15 +1400,10 @@ This class allows for linking an author to a publication while indicating inform - + - - - - - - - + 1 + @@ -1356,10 +1411,15 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ Digital Object Identifier - - + - + 1 + + + + + + @@ -1369,6 +1429,11 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ + + + + + http://www.un.org/Depts/Cartographic/english/htmain.htm http://www.un.org/Depts/Cartographic/english/htmain.htm @@ -1380,17 +1445,22 @@ This class allows for linking an author to a publication while indicating inform http://www.un.org/Depts/Cartographic/french/htmain.htm UN Cartographic Section + + + 1 + + + + + + + - - - - - http://purl.org/dc/terms/ http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html @@ -1399,6 +1469,11 @@ This class allows for linking an author to a publication while indicating inform A summary of the resource. stable + + + + + Role of a person designated by a grantee to direct a project or activity being supported by a grant, and who is accountable to the grantee for the proper conduct of the project or activity. Also known as Program Director or Project Director. @@ -1424,11 +1499,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/en/ - - - - - http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -1442,6 +1512,11 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/es/ + + + + + @@ -1458,16 +1533,6 @@ This class allows for linking an author to a publication while indicating inform - - 1 - - - - - - 1 - - Bibo has the domain of bibo:issue as the class Issue, but an example on their site uses it with Article, referring to the issue number "4" @@ -1475,11 +1540,11 @@ This class allows for linking an author to a publication while indicating inform - Definition taken from: http://en.wikipedia.org/wiki/University University of Florida; Washington University in St. Louis + An institution of higher education and research, which grants academic degrees in a variety of subjects, and provides both undergraduate education and postgraduate education. @@ -1488,54 +1553,70 @@ This class allows for linking an author to a publication while indicating inform Definition from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html + + + 1 + + Top level of all location classes. It's anticipated that the subclasses will be used when classifying items. And, all locations can be viewable via this class. Use subclasses of core:Location when classsifying items. - + - - + 1 + + + + + + + + + + + - - + A document created as a basis for discussion or a very early draft of a formal paper + - - + - - - - - 1 - + + - - - 1 - - Used for a single narrative summary of teaching, typically covering a wide range of courses including for credit and non-credit teaching over multiple semesters; the "teaches" property links a person directly with an instance of a Semester Class, typically from an institutional database of record; then use Teacher Role for information about a person's role in non-credit teaching or their specific contribution to individual courses + + + + + + + + + 1 + + source: http://en.wikipedia.org/wiki/Issn @@ -1551,11 +1632,6 @@ This class allows for linking an author to a publication while indicating inform source of definition: http://www.uspto.gov/main/glossary/#p . The following site has patent number formats: http://www.uspto.gov/patents/ebc/kindcodesum.jsp . - - - - - @@ -1564,10 +1640,10 @@ This class allows for linking an author to a publication while indicating inform - http://purl.org/ontology/bibo/ + Articles usually contain abstracts and bibliographies. Includes peer-reviewed, non-peer-reviewed, and open access journals. Journals are usually indexed in the major academic databases such as PubMed and Web of Science. stable A periodical of scholarly journal Articles. @@ -1583,10 +1659,20 @@ This class allows for linking an author to a publication while indicating inform Contains news articles, opinions, features, advertising, and is usually issued daily or weekly + + + + + + + + + + http://www.fao.org/termportal/contr/es/ http://www.fao.org/termportal/contr/zh/ @@ -1600,25 +1686,20 @@ This class allows for linking an author to a publication while indicating inform FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/fr/ - - - 1 - - - - - - - - + + + + + - + + @@ -1632,16 +1713,11 @@ This class allows for linking an author to a publication while indicating inform - - - - - - Wiley Prize in Biomedical Sciences An Award or Honor + An Award or Honor @@ -1657,10 +1733,21 @@ This class allows for linking an author to a publication while indicating inform - + - - + + + + + + + + + + + + + @@ -1671,21 +1758,21 @@ This class allows for linking an author to a publication while indicating inform An agent that receives a communication document. - - - - - + + + + Only use if no specific subclasses of core:EventSeries desribe the activity. - + A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. - - + + Two or more events that follow on one after the other or are connected one after the other. - - - + + + + Enter building name. If the building's name is a number (as in many governmental organizations such as national laboratories and military bases), then enter it. Do not confuse with the number that appears in a postal address. @@ -1699,11 +1786,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - @@ -1723,10 +1805,10 @@ This class allows for linking an author to a publication while indicating inform use one freetextKeyword assertion for each keyword or phrase. - + - - + + @@ -1734,29 +1816,14 @@ use one freetextKeyword assertion for each keyword or phrase. We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - - - - - - - - - - - + + + - 1 - - - - - 1 - @@ -1768,22 +1835,17 @@ We would like the range of core:outcome to be the union of Event and Process; an Represents educational training that has been received. This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree. - Currently any abstract name is given to individuals of this class. This could change in the future. + + - - + + A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue - - - - - - @@ -1792,10 +1854,10 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ - Facebook; VIVOweb.org; Flickr A group of Webpages accessible on the Web. A group of webpages available within a specific parent address or URL on the World Wide Web + unstable @@ -1813,21 +1875,16 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/zh/ - - - - - - - - + + + Work consisting of collections of previously published works - + Short Definition is the Medical Subject Heading (MeSH) definition A document that simultaneously contains other documents. http://purl.org/ontology/bibo/ @@ -1845,36 +1902,16 @@ We would like the range of core:outcome to be the union of Event and Process; an An area of corporate activity organized as an administrative or functional unit. Definition modified from http://www.thefreedictionary.com/division. It is difficult to tell the difference between a division and a department. - + Cardiovascular Medicine (division within medicine) - - - - - - - - 1 - - - - - - - The Ornithological Newsletter Usually issued periodically, prepared by or for a group or institution to present information to a specific audience, often also made available to the press and public - - - - - @@ -1883,33 +1920,28 @@ We would like the range of core:outcome to be the union of Event and Process; an VIVO Outreach Team; VIVO Ontology Team - + An informal organization brought together for the purposes of a project or event. - - - - - In the future we may be able to make this a defined class that would not need to be directly asserted, but the consensus seems to be that some organizations "are" clinical and some "are" research organizations and that the distinction is important enough to warrant the additional class and class assertions Any organization with a significant clinical function as a matter of course and not just through occasional clinical roles + + + + + A Cornell graduate field (http://vivo.cornell.edu/index.jsp?home=65535&collection=820) An ongoing academic initiative not formalized with department or division status. - - - - - @@ -1934,8 +1966,8 @@ We would like the range of core:outcome to be the union of Event and Process; an Alchohol Education Center; Center for Arts and Public Policy; Hearing Research Center - A place where a particular activity or service is concentrated. + Short Definition take from http://www.thefreedictionary.com/center. @@ -1953,16 +1985,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Indicates the precision of the value of a DateTimeValue instance. - - - 1 - - - - - 1 - - For example an HR job title for a person might be - Assistant University Librarian, and the preferred job title for that same person could be - Physical Sciences Librarian. @@ -1975,10 +1997,10 @@ We would like the range of core:outcome to be the union of Event and Process; an Short Definition from OCLC Input Standards, EntW A document created to summarize research findings associated with the completion of an academic degree. stable - - http://purl.org/ontology/bibo/ Works created to satisfy the requirements for an academic certification or degree; also called dissertation + + @@ -1988,22 +2010,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - - - UN Statistics Division @@ -2020,8 +2032,8 @@ We would like the range of core:outcome to be the union of Event and Process; an Only use if no specific subclasses of core:Role describe the role. - + A person's or organization's type of contribution to an endeavor Only use this broad role class if no subclasses of role describe the item being classified. @@ -2030,6 +2042,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -2046,11 +2063,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - @@ -2066,13 +2078,8 @@ We would like the range of core:outcome to be the union of Event and Process; an UN Cartographic Section UN Cartographic Section - - - - - - + A structured file of information or a set of logically related data stored and retrieved using computer-based means Short Definition is the Medical Subject Heading (MeSH) definition @@ -2085,20 +2092,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - 1 - - - - - - - - - - 1 - + + stable @@ -2109,7 +2106,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A meeting for consultation or discussion. - + @@ -2119,41 +2116,26 @@ We would like the range of core:outcome to be the union of Event and Process; an + A distinct, usually ongoing and specialized unit within a large organization. Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division. - Legal (department within a company); Use for any non-academic department - - - 1 - - - - - - - - - - 1 - - An online article or commentary appearing on a blog + A specific blog posting - Collection of documents or information resources that have a unified identity stable + Collection of documents or information resources that have a unified identity. Archives, museums and libraries often acquire collections on specific subjects and from distinguished authors or researchers. Also includes collections of resources bundled into a license. - http://purl.org/ontology/bibo/ Hill Ornithology Collection; Wiley Interscience Online Books Biochemisty Collection A collection of Documents or Collections @@ -2175,11 +2157,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition obtained here: http://answers.ask.com/Business/Finance/what_is_a_private_company. Examples of private companies found here: http://www.forbes.com/2008/11/03/largest-private-companies-biz-privates08-cx_sr_1103private_land.html - - - - - @@ -2189,9 +2166,9 @@ We would like the range of core:outcome to be the union of Event and Process; an B.A. Bachelor of Arts This list may have multiple abbreviations for some degrees. - An academic degree at any level, both as reported by individuals for employment and as offered by academic degree programs. - + + @@ -2216,11 +2193,6 @@ We would like the range of core:outcome to be the union of Event and Process; an One of a number of areas or communities having their own governments and forming a federation under a sovereign government, as in the US. - - - 1 - - http://purl.org/ontology/bibo/ @@ -2243,10 +2215,10 @@ We would like the range of core:outcome to be the union of Event and Process; an + phonograph record; tape; CD; DVD; DAT - An audio document; aka record. http://purl.org/ontology/bibo/ stable @@ -2273,26 +2245,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ - - - - - - - - 1 - - - - - - - - - - - - FAO terminology @@ -2306,20 +2258,15 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ 2010-06-24 - - - - - http://purl.org/ontology/bibo/ film; video; Blu-ray Audiovisual recording in any format - stable An audio-visual document; film, video, and so forth. + @@ -2356,11 +2303,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://xmlns.com/foaf/spec/#term_lastName. Note from foaf: "The lastName property is provided (alongside firstName) as a mechanism to support legacy data that cannot be easily interpreted in terms of the (otherwise preferred) familyName and givenName properties. The concepts of 'first' and 'last' names do not work well across cultural and linguistic boundaries; however they are widely used in addressbooks and databases." - - - - - @@ -2370,6 +2312,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + UN cartographic maps (http://www.un.org/Depts/Cartographic/map/profile/world.pdf) @@ -2394,6 +2341,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -2402,52 +2354,37 @@ We would like the range of core:outcome to be the union of Event and Process; an - + A defined class of organizations that fund Grants. National Institute of Health (NIH) - - - - - - - - 1 - - - - - 1 - - Definition found here: http://dictionary.reference.com/browse/publisher A person or company whose business is the publishing of books, periodicals, engravings, computer software, etc. - Elsevier; Harper & Row; Indiana University Press - - - - - + - + + + + + + + + - - A student organization is an organization, operated by students at a university, whose membership normally consists only of students. @@ -2461,6 +2398,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Afghanistan; Antigua and Barbuda; Cameroon; Iceland; Jamaica; Nigeria; United States of America + + + 1 + + @@ -2469,25 +2411,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - 1 - - - - - 1 - - - - - - - - - - 1 - + + @@ -2512,9 +2439,9 @@ We would like the range of core:outcome to be the union of Event and Process; an The full URL. Uniform Resource Locator (URL) specifies where an identified resource is available and the mechanism for retrieving it. + http://info.slis.indiana.edu/~katy/ - @@ -2534,10 +2461,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + 1 + + + + + + @@ -2547,15 +2479,15 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable - + - - + + - - - + + + http://www.fao.org/termportal/contr/ar/ @@ -2577,10 +2509,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + 1 - + @@ -2597,6 +2529,21 @@ We would like the range of core:outcome to be the union of Event and Process; an Public Definition source (http://www.answers.com/topic/publisher). + + + + + + + + 1 + + + + + + + An Institute normally has a research focus but may also fulfill instructional or outreach roles. @@ -2604,20 +2551,25 @@ We would like the range of core:outcome to be the union of Event and Process; an Institute for Fundamental Theory - - + This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. - - Only use if no specific subclasses of foaf:organization desribe the organization. A generic class encompassing several types of organizations. + + + + - - - + + Ued to describe an organization related to bibliographic items such as a publishing company, etc. + + + 1 + + http://www.fao.org/termportal/contr/fr/ http://www.fao.org/termportal/contr/es/ @@ -2650,27 +2602,47 @@ We would like the range of core:outcome to be the union of Event and Process; an definition modified from: source (http://en.wikipedia.org/wiki/Seating_capacity). 55 - + - - + + - + + + + + + + + 1 + + + 1 - + The digital file (or physical equivalent), if available after the conference, vs. the act of attending/presenting: use ConferencePresentation for information about date/time/location/name of the event where the poster was presented + + + + + An organized series of workshop events, whether repetitions of the same workshop or multiple different workshops. Use workshop for individual events. + + + + + @@ -2682,40 +2654,35 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - - + Only use if no specific subclasses of event:Event are appropriate. + + This class will also display instances of subclasses under Event, e.g. Philosophy Department Discussion Club; 2009 Racker Lecture; screening of a documentary. In addition to a location in space and time, an event may have any or all the following qualities: actively participating agents, passive factors, work products. Also, it may be in a virtual space or part of a series such as a lecture series. The previous short definition was: "An arbitrary classification of a space/time region, by a cognitive agent." + + + + + Something that happens at a given place and time. - - - - - - - - + + + + - + - 1 - + + @@ -2738,20 +2705,15 @@ The previous short definition was: "An arbitrary classification of a space/time http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - + + + - + 1 - - - - - 1 - + @@ -2776,10 +2738,10 @@ The previous short definition was: "An arbitrary classification of a space/time - + 1 - + @@ -2788,10 +2750,10 @@ The previous short definition was: "An arbitrary classification of a space/time - + + - - + @@ -2799,14 +2761,19 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + - + An award, honor, or distinction received by a person on a particular date (not the award itself as given repeatedly, and not a grant award). A specific award on a particular date or for a particular date range. - + Ninth annual Wiley Prize in Biomedical Sciences, for the discovery of a light activated ion channel - + @@ -2815,6 +2782,11 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + Short Definition from the bibo ontology http://purl.org/ontology/bibo/ @@ -2836,30 +2808,25 @@ The previous short definition was: "An arbitrary classification of a space/time Role of co-principal investigator of a grant, who devotes a specified percentage of time and is considered key personnel. - + + - 1 - + - + 1 - + - + Professor, associate professor and assistant professor are common positions for academic faculty. Professor; Associate Professor; Assistant Professor + Academic position in a university or institution - - - - 1 - - stable @@ -2868,21 +2835,36 @@ The previous short definition was: "An arbitrary classification of a space/time http://en.wikipedia.org/wiki/Global_Trade_Item_Number. Global Trade Item Number 14 + + + + + The dual relationship of a professor advising a student and the student being advised by a professor, typically including start and end dates - + - + + + - - - + - 1 - + + + + + + + + + + + + @@ -2894,6 +2876,11 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + @@ -2915,16 +2902,16 @@ modern society using the world of Star trek. Los Angeles Times, March An section number + + + 1 + + - - - 1 - - http://www.fao.org/termportal/contr/en/ http://www.fao.org/termportal/contr/es/ @@ -2955,9 +2942,24 @@ modern society using the world of Star trek. Los Angeles Times, March + + + + + + + + + + + + + 1 + + @@ -2966,14 +2968,19 @@ modern society using the world of Star trek. Los Angeles Times, March http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet + + + + + a specific period or duration, defined by (optional) start and end date/times. - + 1 - + @@ -2991,15 +2998,15 @@ modern society using the world of Star trek. Los Angeles Times, March Short Definition from bibo ontology - + - 1 - + + - + - - + + @@ -3042,16 +3049,6 @@ modern society using the world of Star trek. Los Angeles Times, March - - - - - - - - - - @@ -3064,11 +3061,6 @@ source: http://en.wikipedia.org/wiki/ORCID . - - - 1 - - Used to link a bibliographic item to its publisher. @@ -3094,10 +3086,20 @@ Examples of a Publisher include a person, an organization, or a service. Typical + + + + + + + + + + academic disciplines or more detailed research area a subject, an academic field, a research area, or a discipline. SC. @@ -3113,6 +3115,11 @@ Examples of a Publisher include a person, an organization, or a service. Typical A presentation of a series of slides, usually presented in front of an audience with written text and images. stable + + + + + @@ -3158,23 +3165,13 @@ Examples of a Publisher include a person, an organization, or a service. Typical 2010-06-24 - - - - - Resource dependent on other entities This class is here so it can be equivalent to vitro:DependentResource. Deletion in the VIVO system behaves differently when deleting members of this class: related individuals may need to be deleted as well. - - - - - - + @@ -3182,11 +3179,16 @@ Examples of a Publisher include a person, an organization, or a service. Typical A distinct, usually specialized educational unit within an educational organization. - + - + Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts) + + + + + @@ -3194,11 +3196,6 @@ Examples of a Publisher include a person, an organization, or a service. Typical RearcherID is a Thomson Reuters project where researchers have a place to manage and share their professional information. It will allow them to solve author identity issues while simultaneously adding dynamic citation metrics and collaboration networks to your personal profile. Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - @@ -3226,22 +3223,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/Critical or explanatory note for a Document. - - - - - - - + + + + An intramural or extramural award to support scholarly work, such as UF09179 (VIVO) Short definition is from the Glossary of NIH Terms. - - Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity - + @@ -3305,10 +3297,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/2010-06-24 http://www.fao.org/termportal/en/ - + - - + 1 + Universal Product Code @@ -3324,11 +3316,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3336,21 +3323,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/Intel Talent Search; poetry contest Not the same as an award or distinction. - + - - + 1 + A proposal for a research grant that has been submitted but not approved; does not represent an existing activity - - - 1 - - @@ -3360,11 +3342,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable - - - - - @@ -3387,11 +3364,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ 0.7 - - - - - http://purl.org/ontology/bibo/ New Yorker @@ -3405,17 +3377,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Address has properties for department name, street, city, state or province, postal code, and country. For US specific address, classify using core:US Postal Code. core:Address will display all addresses. - + University of Waterloo, 200 University Avenue West, Waterloo, Ontario, Canada N2L 3G1 A code and abstract concept expressing a location on the Earth's surface. To classify US specific addresses, use core:US Postal Code. - Librarian; Library Systems Analyst; Music Bibliographer It is the common position in libraries. + A position held by library and information science professionals, or academic or technical experts, in support of providing information services or materials - + @@ -3431,6 +3403,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/es/ + + + 1 + + @@ -3451,11 +3428,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/Library of Congress Control Number Source: http://en.wikipedia.org/wiki/Library_of_Congress_Control_Number. - - - - - @@ -3463,17 +3435,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + A group can also be an organization but need not be; typically used for looser associations of people or organizations acting together in some fashion, not necessarily through formal agreement or on a long-term basis. Added to the VIVO ontology to be able to support informal and perhaps even private groups of people around an idea, funding opportunity, or event. A group of agents - - - 1 - - http://purl.org/ontology/bibo/ unstable @@ -3482,12 +3454,22 @@ Definition source: http://isiwebofknowledge.com/researcherid/A chapter of a book. A main division of a book + + + + 2 + + + + + + Curriculum Steering Committee; PhD Advisory Committee - A group of people organized for a specific purpose (e.g., a reporting or advisory role), often with a charge and for a specific duration. + There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important. @@ -3499,11 +3481,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - stable A legal document; for example, a court decision, a brief, and so forth. @@ -3523,28 +3500,33 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + + - - - - - 1 - This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. + + + + + + + + + + - - 1320 East 10th Street, Wells Library 021 Bloomington, IN 47405 - + + Formal address in US postal address system. + US postal address follow the format street, apt or office number (optional), city, state, and zipcode. @@ -3558,15 +3540,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + 1 - + - + - - + + @@ -3581,17 +3563,22 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print. + + + + + - - - + Short Definition from the bibo ontology unstable - + A section of a book + http://purl.org/ontology/bibo/ + A section of a book. @@ -3605,15 +3592,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - - - - - - + + @@ -3629,16 +3611,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - + + + - - - - - radio or newspaper interview @@ -3648,6 +3625,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable + + + + + @@ -3655,10 +3637,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + 1 - + Definition was take from here: http://dictionary.reference.com/browse/museum @@ -3667,6 +3649,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/The Getty Museum A building or place where works of art, scientific specimens, or other objects of permanent value are kept and displayed. + + + + + unstable http://purl.org/ontology/bibo/ @@ -3675,17 +3662,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - Indiana; Florida; Minnesota; Michigan; New York; Quebec; Manitoba; Ontario + + + + + FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -3705,15 +3692,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - + + - + - - + 1 + @@ -3737,10 +3724,25 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - 1 - + + + + + + 1 + + + + + 1 + + + + + + @@ -3749,17 +3751,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ For example, National Science Foundation providesFundingThrough Graduate Research Fellowship Program; National Institutes of Health providesFundingThrough National Center for Research Resources. - - - 1 - - + + + + + A small reference book, especially one giving instructions. unstable @@ -3784,38 +3786,38 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - - - - - - + + + + + + + + 1 + + A short form for an longer title or name. B.A. + + + 1 + + A person holding a position that is not considered to be an academic appointment. - - - 1 - - @@ -3828,10 +3830,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - + 1 + @@ -3840,6 +3842,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + A location having coordinates in geographic space. @@ -3866,10 +3873,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - + 1 + @@ -3877,6 +3884,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + An agent that is interviewed by another agent. stable @@ -3892,17 +3904,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + Used for a single narrative summary of research, typically covering a wide range of activities and time periods; use Researcher Role for information on individual activities - - - - - A role involving research (funded or unfunded), sometimes linked to a grant @@ -3910,6 +3922,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Bacteria-resistant bandage; Termite prevention system; Hurricane resistant houses + + + + + Relates a document to some transcribed original. The bibo:transcriptOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers this term unstable. @@ -3924,11 +3941,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3938,6 +3950,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/Publication Description source http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . This term is also considered unstable. unstable + + + + + + + + + + @@ -3978,15 +4000,15 @@ bibo has the domain of this property set to the union of Collection and Document - + + + + + + 1 - - - - - - + @@ -4014,15 +4036,25 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/ar/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - + + + 1 + + + + + + + + + + http://purl.org/ontology/bibo/ @@ -4031,41 +4063,46 @@ bibo has the domain of this property set to the union of Collection and Document - - - 1 - - - - + - + + + + + 1 + + + + + + + + + + 1 + + - - - - - @@ -4092,6 +4129,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + http://www.fao.org/termportal/contr/es/ @@ -4123,29 +4165,24 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - - A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate - - + + + Short Definition from the bibo ontology - stable - http://purl.org/ontology/bibo/ - + A document (noun) is a bounded physical representation of body of information designed with the capacity (and usually intent) to communicate. A document may manifest symbolic, diagrammatic or sensory-representational information. + + A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate @@ -4213,28 +4250,53 @@ bibo has the domain of this property set to the union of Collection and Document The Uniform Code Council (UCC) was the Numbering Organization in the USA to administer and manage the EAN.UCC System. In 2005 the UCC changed its name to GS1 US. European Article Number/Uniform Commercier Code 13 + + + + + + + + + + Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. + + + 1 + + An edited book. http://purl.org/ontology/bibo/ + Best American Science Writing 2009 stable - An edited collection of stand-alone articles published as a book - - - + + + - + - - + + + + + + 1 + + + + + + Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible. @@ -4243,22 +4305,12 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Short definition obtained here: http://en.wiktionary.org/wiki/geopolitical_entity. - - - - - - - - - - 100 Caldwell Hall; 114 Martha Van Rensselaer (Rushmore Conference Room) Room that provides a particular service or is used for a particular activity. @@ -4266,44 +4318,59 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Enter room number of name. + + + + + + + + 1 + + + + + + + - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + + + - - + - + + + + + + @@ -4311,10 +4378,15 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Medicine - + - - + 1 + + + + + 1 + http://www.fao.org/termportal/en/ @@ -4334,10 +4406,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Examples shows a book has French language version. Public description source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - + - - + 1 + @@ -4346,10 +4418,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - + + + @@ -4368,23 +4440,28 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi College of Arts & Sciences; Ivy Tech Community College A primary academic unit within a University or a free-standing higher education organization without graduate degree programs. - + + + + + + Document1 isVersionOf Document2 This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - + + + - - - + + 1 + @@ -4410,20 +4487,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - 1 - - - - - - - - - - - + + @@ -4441,11 +4508,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Collection of legal cases stable - - - - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/en/ @@ -4459,21 +4521,46 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + 1 + + - + - - - + + + + + + + + + + + + + + + + + + + + + 1 + + @@ -4485,18 +4572,13 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://xmlns.com/foaf/spec/#term_firstName. Note from foaf: "The lastName property is provided (alongside firstName) as a mechanism to support legacy data that cannot be easily interpreted in terms of the (otherwise preferred) familyName and givenName properties. The concepts of 'first' and 'last' names do not work well across cultural and linguistic boundaries; however they are widely used in addressbooks and databases." - - - 1 - - - UITS service UITS service is the information technology services provided by Indiana University. SC. + A regularly offered service in support of an academic, research, or administrative function (not personal or professional service by an individual) - + @@ -4504,24 +4586,34 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + 1 + + + + + + + - - - - - Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. + + + 1 + + Cornell Ithaca; Cornell Geneva; Cornell New York City; Cornell Qatar @@ -4529,12 +4621,22 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi The grounds of a school, college, university, or hospital. Or, a large, usually suburban, landscaped business or industrial site. + + + + + + + + + + unstable @@ -4544,16 +4646,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ Short Definition from the bibo ontology - - - - - + + + 1 + + @@ -4570,20 +4672,25 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi A work consisting of texts of rules and regulations related to statutes issued by executive or administrative agencies A collection of statutes. + + + + + - An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support - - + + + + Used information from this definition: http://dictionary.reference.com/browse/library. - A collection of any materials, for study and enjoyment, which has been systematically arranged. Marston Science Library @@ -4601,16 +4708,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ - + - - - 1 - - http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -4642,10 +4744,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - + - - + + @@ -4658,10 +4760,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi full email address - + - 1 - + + @@ -4669,19 +4771,14 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - - - - - Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. - - - - - + + + + + @@ -4696,30 +4793,25 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + For data ingest from authoritative sources to record the actual way a person was listed as author, as potentially valuable information for author disambiguation. - - - 1 - - A person who has already received a bachelor's degree and is working toward a Master's or Doctoral degree. - - - 1 - - - - - + + + @@ -4742,17 +4834,17 @@ We would like the range of core:outcome to be the union of Event and Process; an Used to link a bibliographic item to one of its contributor: can be an author, an editor, a publisher, etc. - - - - - + + + + + @@ -4769,30 +4861,15 @@ We would like the range of core:outcome to be the union of Event and Process; an Any organization (likely also asserted as another class of Organization) with a primary, ongoing research function, not just through occasional roles - - - - - - - - - - - - - - - The result of rendering a work from one language to another - + + + - 1 - @@ -4812,16 +4889,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - - - - - - http://www.fao.org/figis/servlet/RefServlet http://www.fao.org/figis/servlet/RefServlet @@ -4835,20 +4902,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - Medical Subject Heading (MeSH) definition of Technical Report: Work consisting of a formal report giving details of the investigation and results of a medical or other scientific problem. When issued by a government agency or comparable official body, its contents may be classified, unclassified, or declassified with regard to security clearance. This publication type may also cover a scientific paper or article that records the current state or current position of scientific research and development. If so labeled by the editor or publisher, this publication type may be properly used for journal articles. A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc.. + http://purl.org/ontology/bibo/ A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc. stable - - - - - @@ -4880,25 +4942,20 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/fr/ - - - - - - - - - - - + + + - + + + + @@ -4909,15 +4966,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - - - - - - + + @@ -4925,21 +4977,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - 1 - - - - - - - @@ -4962,10 +4999,10 @@ We would like the range of core:outcome to be the union of Event and Process; an A person registered in an undergraduate program leading to a bachelor's degree or an undergraduate diploma or certificate. - + + - - + An excerpted collection of words @@ -4976,23 +5013,13 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ Short Definition from the bibo ontology - - - 1 - - - - - - - - + A position involving academic work but without faculty status + Researcher; Academic Extension Associate; Postdoctoral Associate - Those positions are held by people who do academic work but do not have faculty positions in universities or institutes. @@ -5012,6 +5039,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + The example is one outreach role required by US space agency NASA, which is related with one project in NASA. Name of the outreach role should be put here. @@ -5019,21 +5051,21 @@ We would like the range of core:outcome to be the union of Event and Process; an An outreach or community service role directed outside a person's primary profession and institution Communicating Astronomy to the Public - - - + + + stable + + A loose, thematic, collection of Documents, often Books. A thematic collection of documents, usually books, issued at regular or irregular intervals http://purl.org/ontology/bibo/ - Methods in Molecular Biology - @@ -5057,10 +5089,10 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal decision on appeal that takes action on a case (affirming it, reversing it, etc.). - + - - + + @@ -5082,25 +5114,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - 1 - - - - - - - - - - - - - - - - + + @@ -5115,14 +5132,24 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet + + + + + Short Definition modified from the one found here: http://www.thefreedictionary.com/county. - + Alachua; Baker; Bradford; Kenora; Ottawa; Waterloo The largest administrative division of most states or provinces. + + + + + Home page for Scopus: http://www.scopus.com/home.url @@ -5146,39 +5173,44 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - - + 1 + - - + - + 1 + + + + + + - - Short Definition from the bibo ontology A distinct part of a larger document or collected document - + http://purl.org/ontology/bibo/ a distinct part of a larger document or collected document. + + unstable - + + + Short Definition copied from bibo ontology - http://purl.org/ontology/bibo/ - + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers. - - + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers stable @@ -5189,16 +5221,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - - - - - 2 - @@ -5209,22 +5231,40 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - + + + + + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. + + + + + + + + + 1 + + + + + 1 + + - + + + - - @@ -5232,30 +5272,20 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + + - - + A URLLink that is designated (by the user or anyone else) as a primary link for the person, organization, event, etc. - - - 1 - - - - - - - A formal organization of people or organizations around a subject or practice. @@ -5270,10 +5300,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Note: Bibo:editor is used as the inverse of core:editorOf. Public Description for bibo:editor was obtained from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - + + + - - @@ -5286,20 +5316,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - - - - - - - + 1 - + @@ -5317,12 +5337,27 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + 1 + + + + + + + + + + + + http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/es/ @@ -5337,20 +5372,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik FAO terminology - - - - - - - - - - @@ -5366,15 +5391,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - + - - + - + 1 + @@ -5396,15 +5421,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/termportal/en/ 2010-06-24 - + - - + + - + - - + 1 + @@ -5425,21 +5450,16 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49alpha.htm - + - - - - - - - - - - - + + + + 1 + + paraphrased editorial note from the bibo ontology: We are not defining, using an enumeration, the range of the bibo:status to be a defined list of bibo:DocumentStatus. This is because we want people to be able to define new statuses if needed; and creating such an enumeration would prevent this. @@ -5448,11 +5468,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A list of items in a collection; an ordered compilation of item descriptions and sufficient information to afford access to them + - + NLM Catalog Short Definition is the Medical Subject Heading (MeSH) definition - From da4cc41fa4dc30cca61843763b7862ef7d001d90 Mon Sep 17 00:00:00 2001 From: cdtank Date: Fri, 4 Feb 2011 18:46:05 +0000 Subject: [PATCH 326/427] 1. Fixed the javascript & style bug that appeared in different versions of IE for temporal graph vis. (see NIHVIVO-2035) --- .../entitycomparison/layout-ie-67.css | 5 + .../jquery_plugins/flot/r293/excanvas.js | 1427 +++++++++ .../jquery_plugins/flot/r293/excanvas.min.js | 1 + .../jquery_plugins/flot/r293/jquery.flot.js | 2548 +++++++++++++++++ .../flot/r293/jquery.flot.min.js | 462 +++ .../js/visualization/entitycomparison/util.js | 2 +- .../entityComparisonSetup.ftl | 14 +- 7 files changed, 4456 insertions(+), 3 deletions(-) create mode 100644 productMods/css/visualization/entitycomparison/layout-ie-67.css create mode 100644 productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.js create mode 100644 productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js create mode 100644 productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.js create mode 100644 productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js diff --git a/productMods/css/visualization/entitycomparison/layout-ie-67.css b/productMods/css/visualization/entitycomparison/layout-ie-67.css new file mode 100644 index 00000000..b58e34e5 --- /dev/null +++ b/productMods/css/visualization/entitycomparison/layout-ie-67.css @@ -0,0 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +#yaxislabel { + margin-left: -27px; +} \ No newline at end of file diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.js b/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.js new file mode 100644 index 00000000..c40d6f70 --- /dev/null +++ b/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.js @@ -0,0 +1,1427 @@ +// Copyright 2006 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + + +// Known Issues: +// +// * Patterns only support repeat. +// * Radial gradient are not implemented. The VML version of these look very +// different from the canvas one. +// * Clipping paths are not implemented. +// * Coordsize. The width and height attribute have higher priority than the +// width and height style values which isn't correct. +// * Painting mode isn't implemented. +// * Canvas width/height should is using content-box by default. IE in +// Quirks mode will draw the canvas using border-box. Either change your +// doctype to HTML5 +// (http://www.whatwg.org/specs/web-apps/current-work/#the-doctype) +// or use Box Sizing Behavior from WebFX +// (http://webfx.eae.net/dhtml/boxsizing/boxsizing.html) +// * Non uniform scaling does not correctly scale strokes. +// * Filling very large shapes (above 5000 points) is buggy. +// * Optimize. There is always room for speed improvements. + +// Only add this code if we do not already have a canvas implementation +if (!document.createElement('canvas').getContext) { + +(function() { + + // alias some functions to make (compiled) code shorter + var m = Math; + var mr = m.round; + var ms = m.sin; + var mc = m.cos; + var abs = m.abs; + var sqrt = m.sqrt; + + // this is used for sub pixel precision + var Z = 10; + var Z2 = Z / 2; + + /** + * This funtion is assigned to the elements as element.getContext(). + * @this {HTMLElement} + * @return {CanvasRenderingContext2D_} + */ + function getContext() { + return this.context_ || + (this.context_ = new CanvasRenderingContext2D_(this)); + } + + var slice = Array.prototype.slice; + + /** + * Binds a function to an object. The returned function will always use the + * passed in {@code obj} as {@code this}. + * + * Example: + * + * g = bind(f, obj, a, b) + * g(c, d) // will do f.call(obj, a, b, c, d) + * + * @param {Function} f The function to bind the object to + * @param {Object} obj The object that should act as this when the function + * is called + * @param {*} var_args Rest arguments that will be used as the initial + * arguments when the function is called + * @return {Function} A new function that has bound this + */ + function bind(f, obj, var_args) { + var a = slice.call(arguments, 2); + return function() { + return f.apply(obj, a.concat(slice.call(arguments))); + }; + } + + function encodeHtmlAttribute(s) { + return String(s).replace(/&/g, '&').replace(/"/g, '"'); + } + + function addNamespacesAndStylesheet(doc) { + // create xmlns + if (!doc.namespaces['g_vml_']) { + doc.namespaces.add('g_vml_', 'urn:schemas-microsoft-com:vml', + '#default#VML'); + + } + if (!doc.namespaces['g_o_']) { + doc.namespaces.add('g_o_', 'urn:schemas-microsoft-com:office:office', + '#default#VML'); + } + + // Setup default CSS. Only add one style sheet per document + if (!doc.styleSheets['ex_canvas_']) { + var ss = doc.createStyleSheet(); + ss.owningElement.id = 'ex_canvas_'; + ss.cssText = 'canvas{display:inline-block;overflow:hidden;' + + // default size is 300x150 in Gecko and Opera + 'text-align:left;width:300px;height:150px}'; + } + } + + // Add namespaces and stylesheet at startup. + addNamespacesAndStylesheet(document); + + var G_vmlCanvasManager_ = { + init: function(opt_doc) { + if (/MSIE/.test(navigator.userAgent) && !window.opera) { + var doc = opt_doc || document; + // Create a dummy element so that IE will allow canvas elements to be + // recognized. + doc.createElement('canvas'); + doc.attachEvent('onreadystatechange', bind(this.init_, this, doc)); + } + }, + + init_: function(doc) { + // find all canvas elements + var els = doc.getElementsByTagName('canvas'); + for (var i = 0; i < els.length; i++) { + this.initElement(els[i]); + } + }, + + /** + * Public initializes a canvas element so that it can be used as canvas + * element from now on. This is called automatically before the page is + * loaded but if you are creating elements using createElement you need to + * make sure this is called on the element. + * @param {HTMLElement} el The canvas element to initialize. + * @return {HTMLElement} the element that was created. + */ + initElement: function(el) { + if (!el.getContext) { + el.getContext = getContext; + + // Add namespaces and stylesheet to document of the element. + addNamespacesAndStylesheet(el.ownerDocument); + + // Remove fallback content. There is no way to hide text nodes so we + // just remove all childNodes. We could hide all elements and remove + // text nodes but who really cares about the fallback content. + el.innerHTML = ''; + + // do not use inline function because that will leak memory + el.attachEvent('onpropertychange', onPropertyChange); + el.attachEvent('onresize', onResize); + + var attrs = el.attributes; + if (attrs.width && attrs.width.specified) { + // TODO: use runtimeStyle and coordsize + // el.getContext().setWidth_(attrs.width.nodeValue); + el.style.width = attrs.width.nodeValue + 'px'; + } else { + el.width = el.clientWidth; + } + if (attrs.height && attrs.height.specified) { + // TODO: use runtimeStyle and coordsize + // el.getContext().setHeight_(attrs.height.nodeValue); + el.style.height = attrs.height.nodeValue + 'px'; + } else { + el.height = el.clientHeight; + } + //el.getContext().setCoordsize_() + } + return el; + } + }; + + function onPropertyChange(e) { + var el = e.srcElement; + + switch (e.propertyName) { + case 'width': + el.getContext().clearRect(); + el.style.width = el.attributes.width.nodeValue + 'px'; + // In IE8 this does not trigger onresize. + el.firstChild.style.width = el.clientWidth + 'px'; + break; + case 'height': + el.getContext().clearRect(); + el.style.height = el.attributes.height.nodeValue + 'px'; + el.firstChild.style.height = el.clientHeight + 'px'; + break; + } + } + + function onResize(e) { + var el = e.srcElement; + if (el.firstChild) { + el.firstChild.style.width = el.clientWidth + 'px'; + el.firstChild.style.height = el.clientHeight + 'px'; + } + } + + G_vmlCanvasManager_.init(); + + // precompute "00" to "FF" + var decToHex = []; + for (var i = 0; i < 16; i++) { + for (var j = 0; j < 16; j++) { + decToHex[i * 16 + j] = i.toString(16) + j.toString(16); + } + } + + function createMatrixIdentity() { + return [ + [1, 0, 0], + [0, 1, 0], + [0, 0, 1] + ]; + } + + function matrixMultiply(m1, m2) { + var result = createMatrixIdentity(); + + for (var x = 0; x < 3; x++) { + for (var y = 0; y < 3; y++) { + var sum = 0; + + for (var z = 0; z < 3; z++) { + sum += m1[x][z] * m2[z][y]; + } + + result[x][y] = sum; + } + } + return result; + } + + function copyState(o1, o2) { + o2.fillStyle = o1.fillStyle; + o2.lineCap = o1.lineCap; + o2.lineJoin = o1.lineJoin; + o2.lineWidth = o1.lineWidth; + o2.miterLimit = o1.miterLimit; + o2.shadowBlur = o1.shadowBlur; + o2.shadowColor = o1.shadowColor; + o2.shadowOffsetX = o1.shadowOffsetX; + o2.shadowOffsetY = o1.shadowOffsetY; + o2.strokeStyle = o1.strokeStyle; + o2.globalAlpha = o1.globalAlpha; + o2.font = o1.font; + o2.textAlign = o1.textAlign; + o2.textBaseline = o1.textBaseline; + o2.arcScaleX_ = o1.arcScaleX_; + o2.arcScaleY_ = o1.arcScaleY_; + o2.lineScale_ = o1.lineScale_; + } + + var colorData = { + aliceblue: '#F0F8FF', + antiquewhite: '#FAEBD7', + aquamarine: '#7FFFD4', + azure: '#F0FFFF', + beige: '#F5F5DC', + bisque: '#FFE4C4', + black: '#000000', + blanchedalmond: '#FFEBCD', + blueviolet: '#8A2BE2', + brown: '#A52A2A', + burlywood: '#DEB887', + cadetblue: '#5F9EA0', + chartreuse: '#7FFF00', + chocolate: '#D2691E', + coral: '#FF7F50', + cornflowerblue: '#6495ED', + cornsilk: '#FFF8DC', + crimson: '#DC143C', + cyan: '#00FFFF', + darkblue: '#00008B', + darkcyan: '#008B8B', + darkgoldenrod: '#B8860B', + darkgray: '#A9A9A9', + darkgreen: '#006400', + darkgrey: '#A9A9A9', + darkkhaki: '#BDB76B', + darkmagenta: '#8B008B', + darkolivegreen: '#556B2F', + darkorange: '#FF8C00', + darkorchid: '#9932CC', + darkred: '#8B0000', + darksalmon: '#E9967A', + darkseagreen: '#8FBC8F', + darkslateblue: '#483D8B', + darkslategray: '#2F4F4F', + darkslategrey: '#2F4F4F', + darkturquoise: '#00CED1', + darkviolet: '#9400D3', + deeppink: '#FF1493', + deepskyblue: '#00BFFF', + dimgray: '#696969', + dimgrey: '#696969', + dodgerblue: '#1E90FF', + firebrick: '#B22222', + floralwhite: '#FFFAF0', + forestgreen: '#228B22', + gainsboro: '#DCDCDC', + ghostwhite: '#F8F8FF', + gold: '#FFD700', + goldenrod: '#DAA520', + grey: '#808080', + greenyellow: '#ADFF2F', + honeydew: '#F0FFF0', + hotpink: '#FF69B4', + indianred: '#CD5C5C', + indigo: '#4B0082', + ivory: '#FFFFF0', + khaki: '#F0E68C', + lavender: '#E6E6FA', + lavenderblush: '#FFF0F5', + lawngreen: '#7CFC00', + lemonchiffon: '#FFFACD', + lightblue: '#ADD8E6', + lightcoral: '#F08080', + lightcyan: '#E0FFFF', + lightgoldenrodyellow: '#FAFAD2', + lightgreen: '#90EE90', + lightgrey: '#D3D3D3', + lightpink: '#FFB6C1', + lightsalmon: '#FFA07A', + lightseagreen: '#20B2AA', + lightskyblue: '#87CEFA', + lightslategray: '#778899', + lightslategrey: '#778899', + lightsteelblue: '#B0C4DE', + lightyellow: '#FFFFE0', + limegreen: '#32CD32', + linen: '#FAF0E6', + magenta: '#FF00FF', + mediumaquamarine: '#66CDAA', + mediumblue: '#0000CD', + mediumorchid: '#BA55D3', + mediumpurple: '#9370DB', + mediumseagreen: '#3CB371', + mediumslateblue: '#7B68EE', + mediumspringgreen: '#00FA9A', + mediumturquoise: '#48D1CC', + mediumvioletred: '#C71585', + midnightblue: '#191970', + mintcream: '#F5FFFA', + mistyrose: '#FFE4E1', + moccasin: '#FFE4B5', + navajowhite: '#FFDEAD', + oldlace: '#FDF5E6', + olivedrab: '#6B8E23', + orange: '#FFA500', + orangered: '#FF4500', + orchid: '#DA70D6', + palegoldenrod: '#EEE8AA', + palegreen: '#98FB98', + paleturquoise: '#AFEEEE', + palevioletred: '#DB7093', + papayawhip: '#FFEFD5', + peachpuff: '#FFDAB9', + peru: '#CD853F', + pink: '#FFC0CB', + plum: '#DDA0DD', + powderblue: '#B0E0E6', + rosybrown: '#BC8F8F', + royalblue: '#4169E1', + saddlebrown: '#8B4513', + salmon: '#FA8072', + sandybrown: '#F4A460', + seagreen: '#2E8B57', + seashell: '#FFF5EE', + sienna: '#A0522D', + skyblue: '#87CEEB', + slateblue: '#6A5ACD', + slategray: '#708090', + slategrey: '#708090', + snow: '#FFFAFA', + springgreen: '#00FF7F', + steelblue: '#4682B4', + tan: '#D2B48C', + thistle: '#D8BFD8', + tomato: '#FF6347', + turquoise: '#40E0D0', + violet: '#EE82EE', + wheat: '#F5DEB3', + whitesmoke: '#F5F5F5', + yellowgreen: '#9ACD32' + }; + + + function getRgbHslContent(styleString) { + var start = styleString.indexOf('(', 3); + var end = styleString.indexOf(')', start + 1); + var parts = styleString.substring(start + 1, end).split(','); + // add alpha if needed + if (parts.length == 4 && styleString.substr(3, 1) == 'a') { + alpha = Number(parts[3]); + } else { + parts[3] = 1; + } + return parts; + } + + function percent(s) { + return parseFloat(s) / 100; + } + + function clamp(v, min, max) { + return Math.min(max, Math.max(min, v)); + } + + function hslToRgb(parts){ + var r, g, b; + h = parseFloat(parts[0]) / 360 % 360; + if (h < 0) + h++; + s = clamp(percent(parts[1]), 0, 1); + l = clamp(percent(parts[2]), 0, 1); + if (s == 0) { + r = g = b = l; // achromatic + } else { + var q = l < 0.5 ? l * (1 + s) : l + s - l * s; + var p = 2 * l - q; + r = hueToRgb(p, q, h + 1 / 3); + g = hueToRgb(p, q, h); + b = hueToRgb(p, q, h - 1 / 3); + } + + return '#' + decToHex[Math.floor(r * 255)] + + decToHex[Math.floor(g * 255)] + + decToHex[Math.floor(b * 255)]; + } + + function hueToRgb(m1, m2, h) { + if (h < 0) + h++; + if (h > 1) + h--; + + if (6 * h < 1) + return m1 + (m2 - m1) * 6 * h; + else if (2 * h < 1) + return m2; + else if (3 * h < 2) + return m1 + (m2 - m1) * (2 / 3 - h) * 6; + else + return m1; + } + + function processStyle(styleString) { + var str, alpha = 1; + + styleString = String(styleString); + if (styleString.charAt(0) == '#') { + str = styleString; + } else if (/^rgb/.test(styleString)) { + var parts = getRgbHslContent(styleString); + var str = '#', n; + for (var i = 0; i < 3; i++) { + if (parts[i].indexOf('%') != -1) { + n = Math.floor(percent(parts[i]) * 255); + } else { + n = Number(parts[i]); + } + str += decToHex[clamp(n, 0, 255)]; + } + alpha = parts[3]; + } else if (/^hsl/.test(styleString)) { + var parts = getRgbHslContent(styleString); + str = hslToRgb(parts); + alpha = parts[3]; + } else { + str = colorData[styleString] || styleString; + } + return {color: str, alpha: alpha}; + } + + var DEFAULT_STYLE = { + style: 'normal', + variant: 'normal', + weight: 'normal', + size: 10, + family: 'sans-serif' + }; + + // Internal text style cache + var fontStyleCache = {}; + + function processFontStyle(styleString) { + if (fontStyleCache[styleString]) { + return fontStyleCache[styleString]; + } + + var el = document.createElement('div'); + var style = el.style; + try { + style.font = styleString; + } catch (ex) { + // Ignore failures to set to invalid font. + } + + return fontStyleCache[styleString] = { + style: style.fontStyle || DEFAULT_STYLE.style, + variant: style.fontVariant || DEFAULT_STYLE.variant, + weight: style.fontWeight || DEFAULT_STYLE.weight, + size: style.fontSize || DEFAULT_STYLE.size, + family: style.fontFamily || DEFAULT_STYLE.family + }; + } + + function getComputedStyle(style, element) { + var computedStyle = {}; + + for (var p in style) { + computedStyle[p] = style[p]; + } + + // Compute the size + var canvasFontSize = parseFloat(element.currentStyle.fontSize), + fontSize = parseFloat(style.size); + + if (typeof style.size == 'number') { + computedStyle.size = style.size; + } else if (style.size.indexOf('px') != -1) { + computedStyle.size = fontSize; + } else if (style.size.indexOf('em') != -1) { + computedStyle.size = canvasFontSize * fontSize; + } else if(style.size.indexOf('%') != -1) { + computedStyle.size = (canvasFontSize / 100) * fontSize; + } else if (style.size.indexOf('pt') != -1) { + computedStyle.size = fontSize / .75; + } else { + computedStyle.size = canvasFontSize; + } + + // Different scaling between normal text and VML text. This was found using + // trial and error to get the same size as non VML text. + computedStyle.size *= 0.981; + + return computedStyle; + } + + function buildStyle(style) { + return style.style + ' ' + style.variant + ' ' + style.weight + ' ' + + style.size + 'px ' + style.family; + } + + function processLineCap(lineCap) { + switch (lineCap) { + case 'butt': + return 'flat'; + case 'round': + return 'round'; + case 'square': + default: + return 'square'; + } + } + + /** + * This class implements CanvasRenderingContext2D interface as described by + * the WHATWG. + * @param {HTMLElement} surfaceElement The element that the 2D context should + * be associated with + */ + function CanvasRenderingContext2D_(surfaceElement) { + this.m_ = createMatrixIdentity(); + + this.mStack_ = []; + this.aStack_ = []; + this.currentPath_ = []; + + // Canvas context properties + this.strokeStyle = '#000'; + this.fillStyle = '#000'; + + this.lineWidth = 1; + this.lineJoin = 'miter'; + this.lineCap = 'butt'; + this.miterLimit = Z * 1; + this.globalAlpha = 1; + this.font = '10px sans-serif'; + this.textAlign = 'left'; + this.textBaseline = 'alphabetic'; + this.canvas = surfaceElement; + + var el = surfaceElement.ownerDocument.createElement('div'); + el.style.width = surfaceElement.clientWidth + 'px'; + el.style.height = surfaceElement.clientHeight + 'px'; + el.style.overflow = 'hidden'; + el.style.position = 'absolute'; + surfaceElement.appendChild(el); + + this.element_ = el; + this.arcScaleX_ = 1; + this.arcScaleY_ = 1; + this.lineScale_ = 1; + } + + var contextPrototype = CanvasRenderingContext2D_.prototype; + contextPrototype.clearRect = function() { + if (this.textMeasureEl_) { + this.textMeasureEl_.removeNode(true); + this.textMeasureEl_ = null; + } + this.element_.innerHTML = ''; + }; + + contextPrototype.beginPath = function() { + // TODO: Branch current matrix so that save/restore has no effect + // as per safari docs. + this.currentPath_ = []; + }; + + contextPrototype.moveTo = function(aX, aY) { + var p = this.getCoords_(aX, aY); + this.currentPath_.push({type: 'moveTo', x: p.x, y: p.y}); + this.currentX_ = p.x; + this.currentY_ = p.y; + }; + + contextPrototype.lineTo = function(aX, aY) { + var p = this.getCoords_(aX, aY); + this.currentPath_.push({type: 'lineTo', x: p.x, y: p.y}); + + this.currentX_ = p.x; + this.currentY_ = p.y; + }; + + contextPrototype.bezierCurveTo = function(aCP1x, aCP1y, + aCP2x, aCP2y, + aX, aY) { + var p = this.getCoords_(aX, aY); + var cp1 = this.getCoords_(aCP1x, aCP1y); + var cp2 = this.getCoords_(aCP2x, aCP2y); + bezierCurveTo(this, cp1, cp2, p); + }; + + // Helper function that takes the already fixed cordinates. + function bezierCurveTo(self, cp1, cp2, p) { + self.currentPath_.push({ + type: 'bezierCurveTo', + cp1x: cp1.x, + cp1y: cp1.y, + cp2x: cp2.x, + cp2y: cp2.y, + x: p.x, + y: p.y + }); + self.currentX_ = p.x; + self.currentY_ = p.y; + } + + contextPrototype.quadraticCurveTo = function(aCPx, aCPy, aX, aY) { + // the following is lifted almost directly from + // http://developer.mozilla.org/en/docs/Canvas_tutorial:Drawing_shapes + + var cp = this.getCoords_(aCPx, aCPy); + var p = this.getCoords_(aX, aY); + + var cp1 = { + x: this.currentX_ + 2.0 / 3.0 * (cp.x - this.currentX_), + y: this.currentY_ + 2.0 / 3.0 * (cp.y - this.currentY_) + }; + var cp2 = { + x: cp1.x + (p.x - this.currentX_) / 3.0, + y: cp1.y + (p.y - this.currentY_) / 3.0 + }; + + bezierCurveTo(this, cp1, cp2, p); + }; + + contextPrototype.arc = function(aX, aY, aRadius, + aStartAngle, aEndAngle, aClockwise) { + aRadius *= Z; + var arcType = aClockwise ? 'at' : 'wa'; + + var xStart = aX + mc(aStartAngle) * aRadius - Z2; + var yStart = aY + ms(aStartAngle) * aRadius - Z2; + + var xEnd = aX + mc(aEndAngle) * aRadius - Z2; + var yEnd = aY + ms(aEndAngle) * aRadius - Z2; + + // IE won't render arches drawn counter clockwise if xStart == xEnd. + if (xStart == xEnd && !aClockwise) { + xStart += 0.125; // Offset xStart by 1/80 of a pixel. Use something + // that can be represented in binary + } + + var p = this.getCoords_(aX, aY); + var pStart = this.getCoords_(xStart, yStart); + var pEnd = this.getCoords_(xEnd, yEnd); + + this.currentPath_.push({type: arcType, + x: p.x, + y: p.y, + radius: aRadius, + xStart: pStart.x, + yStart: pStart.y, + xEnd: pEnd.x, + yEnd: pEnd.y}); + + }; + + contextPrototype.rect = function(aX, aY, aWidth, aHeight) { + this.moveTo(aX, aY); + this.lineTo(aX + aWidth, aY); + this.lineTo(aX + aWidth, aY + aHeight); + this.lineTo(aX, aY + aHeight); + this.closePath(); + }; + + contextPrototype.strokeRect = function(aX, aY, aWidth, aHeight) { + var oldPath = this.currentPath_; + this.beginPath(); + + this.moveTo(aX, aY); + this.lineTo(aX + aWidth, aY); + this.lineTo(aX + aWidth, aY + aHeight); + this.lineTo(aX, aY + aHeight); + this.closePath(); + this.stroke(); + + this.currentPath_ = oldPath; + }; + + contextPrototype.fillRect = function(aX, aY, aWidth, aHeight) { + var oldPath = this.currentPath_; + this.beginPath(); + + this.moveTo(aX, aY); + this.lineTo(aX + aWidth, aY); + this.lineTo(aX + aWidth, aY + aHeight); + this.lineTo(aX, aY + aHeight); + this.closePath(); + this.fill(); + + this.currentPath_ = oldPath; + }; + + contextPrototype.createLinearGradient = function(aX0, aY0, aX1, aY1) { + var gradient = new CanvasGradient_('gradient'); + gradient.x0_ = aX0; + gradient.y0_ = aY0; + gradient.x1_ = aX1; + gradient.y1_ = aY1; + return gradient; + }; + + contextPrototype.createRadialGradient = function(aX0, aY0, aR0, + aX1, aY1, aR1) { + var gradient = new CanvasGradient_('gradientradial'); + gradient.x0_ = aX0; + gradient.y0_ = aY0; + gradient.r0_ = aR0; + gradient.x1_ = aX1; + gradient.y1_ = aY1; + gradient.r1_ = aR1; + return gradient; + }; + + contextPrototype.drawImage = function(image, var_args) { + var dx, dy, dw, dh, sx, sy, sw, sh; + + // to find the original width we overide the width and height + var oldRuntimeWidth = image.runtimeStyle.width; + var oldRuntimeHeight = image.runtimeStyle.height; + image.runtimeStyle.width = 'auto'; + image.runtimeStyle.height = 'auto'; + + // get the original size + var w = image.width; + var h = image.height; + + // and remove overides + image.runtimeStyle.width = oldRuntimeWidth; + image.runtimeStyle.height = oldRuntimeHeight; + + if (arguments.length == 3) { + dx = arguments[1]; + dy = arguments[2]; + sx = sy = 0; + sw = dw = w; + sh = dh = h; + } else if (arguments.length == 5) { + dx = arguments[1]; + dy = arguments[2]; + dw = arguments[3]; + dh = arguments[4]; + sx = sy = 0; + sw = w; + sh = h; + } else if (arguments.length == 9) { + sx = arguments[1]; + sy = arguments[2]; + sw = arguments[3]; + sh = arguments[4]; + dx = arguments[5]; + dy = arguments[6]; + dw = arguments[7]; + dh = arguments[8]; + } else { + throw Error('Invalid number of arguments'); + } + + var d = this.getCoords_(dx, dy); + + var w2 = sw / 2; + var h2 = sh / 2; + + var vmlStr = []; + + var W = 10; + var H = 10; + + // For some reason that I've now forgotten, using divs didn't work + vmlStr.push(' ' , + '', + ''); + + this.element_.insertAdjacentHTML('BeforeEnd', vmlStr.join('')); + }; + + contextPrototype.stroke = function(aFill) { + var W = 10; + var H = 10; + // Divide the shape into chunks if it's too long because IE has a limit + // somewhere for how long a VML shape can be. This simple division does + // not work with fills, only strokes, unfortunately. + var chunkSize = 5000; + + var min = {x: null, y: null}; + var max = {x: null, y: null}; + + for (var j = 0; j < this.currentPath_.length; j += chunkSize) { + var lineStr = []; + var lineOpen = false; + + lineStr.push(''); + + if (!aFill) { + appendStroke(this, lineStr); + } else { + appendFill(this, lineStr, min, max); + } + + lineStr.push(''); + + this.element_.insertAdjacentHTML('beforeEnd', lineStr.join('')); + } + }; + + function appendStroke(ctx, lineStr) { + var a = processStyle(ctx.strokeStyle); + var color = a.color; + var opacity = a.alpha * ctx.globalAlpha; + var lineWidth = ctx.lineScale_ * ctx.lineWidth; + + // VML cannot correctly render a line if the width is less than 1px. + // In that case, we dilute the color to make the line look thinner. + if (lineWidth < 1) { + opacity *= lineWidth; + } + + lineStr.push( + '' + ); + } + + function appendFill(ctx, lineStr, min, max) { + var fillStyle = ctx.fillStyle; + var arcScaleX = ctx.arcScaleX_; + var arcScaleY = ctx.arcScaleY_; + var width = max.x - min.x; + var height = max.y - min.y; + if (fillStyle instanceof CanvasGradient_) { + // TODO: Gradients transformed with the transformation matrix. + var angle = 0; + var focus = {x: 0, y: 0}; + + // additional offset + var shift = 0; + // scale factor for offset + var expansion = 1; + + if (fillStyle.type_ == 'gradient') { + var x0 = fillStyle.x0_ / arcScaleX; + var y0 = fillStyle.y0_ / arcScaleY; + var x1 = fillStyle.x1_ / arcScaleX; + var y1 = fillStyle.y1_ / arcScaleY; + var p0 = ctx.getCoords_(x0, y0); + var p1 = ctx.getCoords_(x1, y1); + var dx = p1.x - p0.x; + var dy = p1.y - p0.y; + angle = Math.atan2(dx, dy) * 180 / Math.PI; + + // The angle should be a non-negative number. + if (angle < 0) { + angle += 360; + } + + // Very small angles produce an unexpected result because they are + // converted to a scientific notation string. + if (angle < 1e-6) { + angle = 0; + } + } else { + var p0 = ctx.getCoords_(fillStyle.x0_, fillStyle.y0_); + focus = { + x: (p0.x - min.x) / width, + y: (p0.y - min.y) / height + }; + + width /= arcScaleX * Z; + height /= arcScaleY * Z; + var dimension = m.max(width, height); + shift = 2 * fillStyle.r0_ / dimension; + expansion = 2 * fillStyle.r1_ / dimension - shift; + } + + // We need to sort the color stops in ascending order by offset, + // otherwise IE won't interpret it correctly. + var stops = fillStyle.colors_; + stops.sort(function(cs1, cs2) { + return cs1.offset - cs2.offset; + }); + + var length = stops.length; + var color1 = stops[0].color; + var color2 = stops[length - 1].color; + var opacity1 = stops[0].alpha * ctx.globalAlpha; + var opacity2 = stops[length - 1].alpha * ctx.globalAlpha; + + var colors = []; + for (var i = 0; i < length; i++) { + var stop = stops[i]; + colors.push(stop.offset * expansion + shift + ' ' + stop.color); + } + + // When colors attribute is used, the meanings of opacity and o:opacity2 + // are reversed. + lineStr.push(''); + } else if (fillStyle instanceof CanvasPattern_) { + if (width && height) { + var deltaLeft = -min.x; + var deltaTop = -min.y; + lineStr.push(''); + } + } else { + var a = processStyle(ctx.fillStyle); + var color = a.color; + var opacity = a.alpha * ctx.globalAlpha; + lineStr.push(''); + } + } + + contextPrototype.fill = function() { + this.stroke(true); + }; + + contextPrototype.closePath = function() { + this.currentPath_.push({type: 'close'}); + }; + + /** + * @private + */ + contextPrototype.getCoords_ = function(aX, aY) { + var m = this.m_; + return { + x: Z * (aX * m[0][0] + aY * m[1][0] + m[2][0]) - Z2, + y: Z * (aX * m[0][1] + aY * m[1][1] + m[2][1]) - Z2 + }; + }; + + contextPrototype.save = function() { + var o = {}; + copyState(this, o); + this.aStack_.push(o); + this.mStack_.push(this.m_); + this.m_ = matrixMultiply(createMatrixIdentity(), this.m_); + }; + + contextPrototype.restore = function() { + if (this.aStack_.length) { + copyState(this.aStack_.pop(), this); + this.m_ = this.mStack_.pop(); + } + }; + + function matrixIsFinite(m) { + return isFinite(m[0][0]) && isFinite(m[0][1]) && + isFinite(m[1][0]) && isFinite(m[1][1]) && + isFinite(m[2][0]) && isFinite(m[2][1]); + } + + function setM(ctx, m, updateLineScale) { + if (!matrixIsFinite(m)) { + return; + } + ctx.m_ = m; + + if (updateLineScale) { + // Get the line scale. + // Determinant of this.m_ means how much the area is enlarged by the + // transformation. So its square root can be used as a scale factor + // for width. + var det = m[0][0] * m[1][1] - m[0][1] * m[1][0]; + ctx.lineScale_ = sqrt(abs(det)); + } + } + + contextPrototype.translate = function(aX, aY) { + var m1 = [ + [1, 0, 0], + [0, 1, 0], + [aX, aY, 1] + ]; + + setM(this, matrixMultiply(m1, this.m_), false); + }; + + contextPrototype.rotate = function(aRot) { + var c = mc(aRot); + var s = ms(aRot); + + var m1 = [ + [c, s, 0], + [-s, c, 0], + [0, 0, 1] + ]; + + setM(this, matrixMultiply(m1, this.m_), false); + }; + + contextPrototype.scale = function(aX, aY) { + this.arcScaleX_ *= aX; + this.arcScaleY_ *= aY; + var m1 = [ + [aX, 0, 0], + [0, aY, 0], + [0, 0, 1] + ]; + + setM(this, matrixMultiply(m1, this.m_), true); + }; + + contextPrototype.transform = function(m11, m12, m21, m22, dx, dy) { + var m1 = [ + [m11, m12, 0], + [m21, m22, 0], + [dx, dy, 1] + ]; + + setM(this, matrixMultiply(m1, this.m_), true); + }; + + contextPrototype.setTransform = function(m11, m12, m21, m22, dx, dy) { + var m = [ + [m11, m12, 0], + [m21, m22, 0], + [dx, dy, 1] + ]; + + setM(this, m, true); + }; + + /** + * The text drawing function. + * The maxWidth argument isn't taken in account, since no browser supports + * it yet. + */ + contextPrototype.drawText_ = function(text, x, y, maxWidth, stroke) { + var m = this.m_, + delta = 1000, + left = 0, + right = delta, + offset = {x: 0, y: 0}, + lineStr = []; + + var fontStyle = getComputedStyle(processFontStyle(this.font), + this.element_); + + var fontStyleString = buildStyle(fontStyle); + + var elementStyle = this.element_.currentStyle; + var textAlign = this.textAlign.toLowerCase(); + switch (textAlign) { + case 'left': + case 'center': + case 'right': + break; + case 'end': + textAlign = elementStyle.direction == 'ltr' ? 'right' : 'left'; + break; + case 'start': + textAlign = elementStyle.direction == 'rtl' ? 'right' : 'left'; + break; + default: + textAlign = 'left'; + } + + // 1.75 is an arbitrary number, as there is no info about the text baseline + switch (this.textBaseline) { + case 'hanging': + case 'top': + offset.y = fontStyle.size / 1.75; + break; + case 'middle': + break; + default: + case null: + case 'alphabetic': + case 'ideographic': + case 'bottom': + offset.y = -fontStyle.size / 2.25; + break; + } + + switch(textAlign) { + case 'right': + left = delta; + right = 0.05; + break; + case 'center': + left = right = delta / 2; + break; + } + + var d = this.getCoords_(x + offset.x, y + offset.y); + + lineStr.push(''); + + if (stroke) { + appendStroke(this, lineStr); + } else { + // TODO: Fix the min and max params. + appendFill(this, lineStr, {x: -left, y: 0}, + {x: right, y: fontStyle.size}); + } + + var skewM = m[0][0].toFixed(3) + ',' + m[1][0].toFixed(3) + ',' + + m[0][1].toFixed(3) + ',' + m[1][1].toFixed(3) + ',0,0'; + + var skewOffset = mr(d.x / Z) + ',' + mr(d.y / Z); + + lineStr.push('', + '', + ''); + + this.element_.insertAdjacentHTML('beforeEnd', lineStr.join('')); + }; + + contextPrototype.fillText = function(text, x, y, maxWidth) { + this.drawText_(text, x, y, maxWidth, false); + }; + + contextPrototype.strokeText = function(text, x, y, maxWidth) { + this.drawText_(text, x, y, maxWidth, true); + }; + + contextPrototype.measureText = function(text) { + if (!this.textMeasureEl_) { + var s = ''; + this.element_.insertAdjacentHTML('beforeEnd', s); + this.textMeasureEl_ = this.element_.lastChild; + } + var doc = this.element_.ownerDocument; + this.textMeasureEl_.innerHTML = ''; + this.textMeasureEl_.style.font = this.font; + // Don't use innerHTML or innerText because they allow markup/whitespace. + this.textMeasureEl_.appendChild(doc.createTextNode(text)); + return {width: this.textMeasureEl_.offsetWidth}; + }; + + /******** STUBS ********/ + contextPrototype.clip = function() { + // TODO: Implement + }; + + contextPrototype.arcTo = function() { + // TODO: Implement + }; + + contextPrototype.createPattern = function(image, repetition) { + return new CanvasPattern_(image, repetition); + }; + + // Gradient / Pattern Stubs + function CanvasGradient_(aType) { + this.type_ = aType; + this.x0_ = 0; + this.y0_ = 0; + this.r0_ = 0; + this.x1_ = 0; + this.y1_ = 0; + this.r1_ = 0; + this.colors_ = []; + } + + CanvasGradient_.prototype.addColorStop = function(aOffset, aColor) { + aColor = processStyle(aColor); + this.colors_.push({offset: aOffset, + color: aColor.color, + alpha: aColor.alpha}); + }; + + function CanvasPattern_(image, repetition) { + assertImageIsValid(image); + switch (repetition) { + case 'repeat': + case null: + case '': + this.repetition_ = 'repeat'; + break + case 'repeat-x': + case 'repeat-y': + case 'no-repeat': + this.repetition_ = repetition; + break; + default: + throwException('SYNTAX_ERR'); + } + + this.src_ = image.src; + this.width_ = image.width; + this.height_ = image.height; + } + + function throwException(s) { + throw new DOMException_(s); + } + + function assertImageIsValid(img) { + if (!img || img.nodeType != 1 || img.tagName != 'IMG') { + throwException('TYPE_MISMATCH_ERR'); + } + if (img.readyState != 'complete') { + throwException('INVALID_STATE_ERR'); + } + } + + function DOMException_(s) { + this.code = this[s]; + this.message = s +': DOM Exception ' + this.code; + } + var p = DOMException_.prototype = new Error; + p.INDEX_SIZE_ERR = 1; + p.DOMSTRING_SIZE_ERR = 2; + p.HIERARCHY_REQUEST_ERR = 3; + p.WRONG_DOCUMENT_ERR = 4; + p.INVALID_CHARACTER_ERR = 5; + p.NO_DATA_ALLOWED_ERR = 6; + p.NO_MODIFICATION_ALLOWED_ERR = 7; + p.NOT_FOUND_ERR = 8; + p.NOT_SUPPORTED_ERR = 9; + p.INUSE_ATTRIBUTE_ERR = 10; + p.INVALID_STATE_ERR = 11; + p.SYNTAX_ERR = 12; + p.INVALID_MODIFICATION_ERR = 13; + p.NAMESPACE_ERR = 14; + p.INVALID_ACCESS_ERR = 15; + p.VALIDATION_ERR = 16; + p.TYPE_MISMATCH_ERR = 17; + + // set up externs + G_vmlCanvasManager = G_vmlCanvasManager_; + CanvasRenderingContext2D = CanvasRenderingContext2D_; + CanvasGradient = CanvasGradient_; + CanvasPattern = CanvasPattern_; + DOMException = DOMException_; +})(); + +} // if diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js b/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js new file mode 100644 index 00000000..12c74f7b --- /dev/null +++ b/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js @@ -0,0 +1 @@ +if(!document.createElement("canvas").getContext){(function(){var z=Math;var K=z.round;var J=z.sin;var U=z.cos;var b=z.abs;var k=z.sqrt;var D=10;var F=D/2;function T(){return this.context_||(this.context_=new W(this))}var O=Array.prototype.slice;function G(i,j,m){var Z=O.call(arguments,2);return function(){return i.apply(j,Z.concat(O.call(arguments)))}}function AD(Z){return String(Z).replace(/&/g,"&").replace(/"/g,""")}function r(i){if(!i.namespaces.g_vml_){i.namespaces.add("g_vml_","urn:schemas-microsoft-com:vml","#default#VML")}if(!i.namespaces.g_o_){i.namespaces.add("g_o_","urn:schemas-microsoft-com:office:office","#default#VML")}if(!i.styleSheets.ex_canvas_){var Z=i.createStyleSheet();Z.owningElement.id="ex_canvas_";Z.cssText="canvas{display:inline-block;overflow:hidden;text-align:left;width:300px;height:150px}"}}r(document);var E={init:function(Z){if(/MSIE/.test(navigator.userAgent)&&!window.opera){var i=Z||document;i.createElement("canvas");i.attachEvent("onreadystatechange",G(this.init_,this,i))}},init_:function(m){var j=m.getElementsByTagName("canvas");for(var Z=0;Z1){j--}if(6*j<1){return i+(Z-i)*6*j}else{if(2*j<1){return Z}else{if(3*j<2){return i+(Z-i)*(2/3-j)*6}else{return i}}}}function Y(Z){var AE,p=1;Z=String(Z);if(Z.charAt(0)=="#"){AE=Z}else{if(/^rgb/.test(Z)){var m=g(Z);var AE="#",AF;for(var j=0;j<3;j++){if(m[j].indexOf("%")!=-1){AF=Math.floor(C(m[j])*255)}else{AF=Number(m[j])}AE+=I[N(AF,0,255)]}p=m[3]}else{if(/^hsl/.test(Z)){var m=g(Z);AE=c(m);p=m[3]}else{AE=B[Z]||Z}}}return{color:AE,alpha:p}}var L={style:"normal",variant:"normal",weight:"normal",size:10,family:"sans-serif"};var f={};function X(Z){if(f[Z]){return f[Z]}var m=document.createElement("div");var j=m.style;try{j.font=Z}catch(i){}return f[Z]={style:j.fontStyle||L.style,variant:j.fontVariant||L.variant,weight:j.fontWeight||L.weight,size:j.fontSize||L.size,family:j.fontFamily||L.family}}function P(j,i){var Z={};for(var AF in j){Z[AF]=j[AF]}var AE=parseFloat(i.currentStyle.fontSize),m=parseFloat(j.size);if(typeof j.size=="number"){Z.size=j.size}else{if(j.size.indexOf("px")!=-1){Z.size=m}else{if(j.size.indexOf("em")!=-1){Z.size=AE*m}else{if(j.size.indexOf("%")!=-1){Z.size=(AE/100)*m}else{if(j.size.indexOf("pt")!=-1){Z.size=m/0.75}else{Z.size=AE}}}}}Z.size*=0.981;return Z}function AA(Z){return Z.style+" "+Z.variant+" "+Z.weight+" "+Z.size+"px "+Z.family}function t(Z){switch(Z){case"butt":return"flat";case"round":return"round";case"square":default:return"square"}}function W(i){this.m_=V();this.mStack_=[];this.aStack_=[];this.currentPath_=[];this.strokeStyle="#000";this.fillStyle="#000";this.lineWidth=1;this.lineJoin="miter";this.lineCap="butt";this.miterLimit=D*1;this.globalAlpha=1;this.font="10px sans-serif";this.textAlign="left";this.textBaseline="alphabetic";this.canvas=i;var Z=i.ownerDocument.createElement("div");Z.style.width=i.clientWidth+"px";Z.style.height=i.clientHeight+"px";Z.style.overflow="hidden";Z.style.position="absolute";i.appendChild(Z);this.element_=Z;this.arcScaleX_=1;this.arcScaleY_=1;this.lineScale_=1}var M=W.prototype;M.clearRect=function(){if(this.textMeasureEl_){this.textMeasureEl_.removeNode(true);this.textMeasureEl_=null}this.element_.innerHTML=""};M.beginPath=function(){this.currentPath_=[]};M.moveTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"moveTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.lineTo=function(i,Z){var j=this.getCoords_(i,Z);this.currentPath_.push({type:"lineTo",x:j.x,y:j.y});this.currentX_=j.x;this.currentY_=j.y};M.bezierCurveTo=function(j,i,AI,AH,AG,AE){var Z=this.getCoords_(AG,AE);var AF=this.getCoords_(j,i);var m=this.getCoords_(AI,AH);e(this,AF,m,Z)};function e(Z,m,j,i){Z.currentPath_.push({type:"bezierCurveTo",cp1x:m.x,cp1y:m.y,cp2x:j.x,cp2y:j.y,x:i.x,y:i.y});Z.currentX_=i.x;Z.currentY_=i.y}M.quadraticCurveTo=function(AG,j,i,Z){var AF=this.getCoords_(AG,j);var AE=this.getCoords_(i,Z);var AH={x:this.currentX_+2/3*(AF.x-this.currentX_),y:this.currentY_+2/3*(AF.y-this.currentY_)};var m={x:AH.x+(AE.x-this.currentX_)/3,y:AH.y+(AE.y-this.currentY_)/3};e(this,AH,m,AE)};M.arc=function(AJ,AH,AI,AE,i,j){AI*=D;var AN=j?"at":"wa";var AK=AJ+U(AE)*AI-F;var AM=AH+J(AE)*AI-F;var Z=AJ+U(i)*AI-F;var AL=AH+J(i)*AI-F;if(AK==Z&&!j){AK+=0.125}var m=this.getCoords_(AJ,AH);var AG=this.getCoords_(AK,AM);var AF=this.getCoords_(Z,AL);this.currentPath_.push({type:AN,x:m.x,y:m.y,radius:AI,xStart:AG.x,yStart:AG.y,xEnd:AF.x,yEnd:AF.y})};M.rect=function(j,i,Z,m){this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath()};M.strokeRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.stroke();this.currentPath_=p};M.fillRect=function(j,i,Z,m){var p=this.currentPath_;this.beginPath();this.moveTo(j,i);this.lineTo(j+Z,i);this.lineTo(j+Z,i+m);this.lineTo(j,i+m);this.closePath();this.fill();this.currentPath_=p};M.createLinearGradient=function(i,m,Z,j){var p=new v("gradient");p.x0_=i;p.y0_=m;p.x1_=Z;p.y1_=j;return p};M.createRadialGradient=function(m,AE,j,i,p,Z){var AF=new v("gradientradial");AF.x0_=m;AF.y0_=AE;AF.r0_=j;AF.x1_=i;AF.y1_=p;AF.r1_=Z;return AF};M.drawImage=function(AO,j){var AH,AF,AJ,AV,AM,AK,AQ,AX;var AI=AO.runtimeStyle.width;var AN=AO.runtimeStyle.height;AO.runtimeStyle.width="auto";AO.runtimeStyle.height="auto";var AG=AO.width;var AT=AO.height;AO.runtimeStyle.width=AI;AO.runtimeStyle.height=AN;if(arguments.length==3){AH=arguments[1];AF=arguments[2];AM=AK=0;AQ=AJ=AG;AX=AV=AT}else{if(arguments.length==5){AH=arguments[1];AF=arguments[2];AJ=arguments[3];AV=arguments[4];AM=AK=0;AQ=AG;AX=AT}else{if(arguments.length==9){AM=arguments[1];AK=arguments[2];AQ=arguments[3];AX=arguments[4];AH=arguments[5];AF=arguments[6];AJ=arguments[7];AV=arguments[8]}else{throw Error("Invalid number of arguments")}}}var AW=this.getCoords_(AH,AF);var m=AQ/2;var i=AX/2;var AU=[];var Z=10;var AE=10;AU.push(" ','","");this.element_.insertAdjacentHTML("BeforeEnd",AU.join(""))};M.stroke=function(AM){var m=10;var AN=10;var AE=5000;var AG={x:null,y:null};var AL={x:null,y:null};for(var AH=0;AHAL.x){AL.x=Z.x}if(AG.y==null||Z.yAL.y){AL.y=Z.y}}}AK.push(' ">');if(!AM){R(this,AK)}else{a(this,AK,AG,AL)}AK.push("");this.element_.insertAdjacentHTML("beforeEnd",AK.join(""))}};function R(j,AE){var i=Y(j.strokeStyle);var m=i.color;var p=i.alpha*j.globalAlpha;var Z=j.lineScale_*j.lineWidth;if(Z<1){p*=Z}AE.push("')}function a(AO,AG,Ah,AP){var AH=AO.fillStyle;var AY=AO.arcScaleX_;var AX=AO.arcScaleY_;var Z=AP.x-Ah.x;var m=AP.y-Ah.y;if(AH instanceof v){var AL=0;var Ac={x:0,y:0};var AU=0;var AK=1;if(AH.type_=="gradient"){var AJ=AH.x0_/AY;var j=AH.y0_/AX;var AI=AH.x1_/AY;var Aj=AH.y1_/AX;var Ag=AO.getCoords_(AJ,j);var Af=AO.getCoords_(AI,Aj);var AE=Af.x-Ag.x;var p=Af.y-Ag.y;AL=Math.atan2(AE,p)*180/Math.PI;if(AL<0){AL+=360}if(AL<0.000001){AL=0}}else{var Ag=AO.getCoords_(AH.x0_,AH.y0_);Ac={x:(Ag.x-Ah.x)/Z,y:(Ag.y-Ah.y)/m};Z/=AY*D;m/=AX*D;var Aa=z.max(Z,m);AU=2*AH.r0_/Aa;AK=2*AH.r1_/Aa-AU}var AS=AH.colors_;AS.sort(function(Ak,i){return Ak.offset-i.offset});var AN=AS.length;var AR=AS[0].color;var AQ=AS[AN-1].color;var AW=AS[0].alpha*AO.globalAlpha;var AV=AS[AN-1].alpha*AO.globalAlpha;var Ab=[];for(var Ae=0;Ae')}else{if(AH instanceof u){if(Z&&m){var AF=-Ah.x;var AZ=-Ah.y;AG.push("')}}else{var Ai=Y(AO.fillStyle);var AT=Ai.color;var Ad=Ai.alpha*AO.globalAlpha;AG.push('')}}}M.fill=function(){this.stroke(true)};M.closePath=function(){this.currentPath_.push({type:"close"})};M.getCoords_=function(j,i){var Z=this.m_;return{x:D*(j*Z[0][0]+i*Z[1][0]+Z[2][0])-F,y:D*(j*Z[0][1]+i*Z[1][1]+Z[2][1])-F}};M.save=function(){var Z={};Q(this,Z);this.aStack_.push(Z);this.mStack_.push(this.m_);this.m_=d(V(),this.m_)};M.restore=function(){if(this.aStack_.length){Q(this.aStack_.pop(),this);this.m_=this.mStack_.pop()}};function H(Z){return isFinite(Z[0][0])&&isFinite(Z[0][1])&&isFinite(Z[1][0])&&isFinite(Z[1][1])&&isFinite(Z[2][0])&&isFinite(Z[2][1])}function y(i,Z,j){if(!H(Z)){return }i.m_=Z;if(j){var p=Z[0][0]*Z[1][1]-Z[0][1]*Z[1][0];i.lineScale_=k(b(p))}}M.translate=function(j,i){var Z=[[1,0,0],[0,1,0],[j,i,1]];y(this,d(Z,this.m_),false)};M.rotate=function(i){var m=U(i);var j=J(i);var Z=[[m,j,0],[-j,m,0],[0,0,1]];y(this,d(Z,this.m_),false)};M.scale=function(j,i){this.arcScaleX_*=j;this.arcScaleY_*=i;var Z=[[j,0,0],[0,i,0],[0,0,1]];y(this,d(Z,this.m_),true)};M.transform=function(p,m,AF,AE,i,Z){var j=[[p,m,0],[AF,AE,0],[i,Z,1]];y(this,d(j,this.m_),true)};M.setTransform=function(AE,p,AG,AF,j,i){var Z=[[AE,p,0],[AG,AF,0],[j,i,1]];y(this,Z,true)};M.drawText_=function(AK,AI,AH,AN,AG){var AM=this.m_,AQ=1000,i=0,AP=AQ,AF={x:0,y:0},AE=[];var Z=P(X(this.font),this.element_);var j=AA(Z);var AR=this.element_.currentStyle;var p=this.textAlign.toLowerCase();switch(p){case"left":case"center":case"right":break;case"end":p=AR.direction=="ltr"?"right":"left";break;case"start":p=AR.direction=="rtl"?"right":"left";break;default:p="left"}switch(this.textBaseline){case"hanging":case"top":AF.y=Z.size/1.75;break;case"middle":break;default:case null:case"alphabetic":case"ideographic":case"bottom":AF.y=-Z.size/2.25;break}switch(p){case"right":i=AQ;AP=0.05;break;case"center":i=AP=AQ/2;break}var AO=this.getCoords_(AI+AF.x,AH+AF.y);AE.push('');if(AG){R(this,AE)}else{a(this,AE,{x:-i,y:0},{x:AP,y:Z.size})}var AL=AM[0][0].toFixed(3)+","+AM[1][0].toFixed(3)+","+AM[0][1].toFixed(3)+","+AM[1][1].toFixed(3)+",0,0";var AJ=K(AO.x/D)+","+K(AO.y/D);AE.push('','','');this.element_.insertAdjacentHTML("beforeEnd",AE.join(""))};M.fillText=function(j,Z,m,i){this.drawText_(j,Z,m,i,false)};M.strokeText=function(j,Z,m,i){this.drawText_(j,Z,m,i,true)};M.measureText=function(j){if(!this.textMeasureEl_){var Z='';this.element_.insertAdjacentHTML("beforeEnd",Z);this.textMeasureEl_=this.element_.lastChild}var i=this.element_.ownerDocument;this.textMeasureEl_.innerHTML="";this.textMeasureEl_.style.font=this.font;this.textMeasureEl_.appendChild(i.createTextNode(j));return{width:this.textMeasureEl_.offsetWidth}};M.clip=function(){};M.arcTo=function(){};M.createPattern=function(i,Z){return new u(i,Z)};function v(Z){this.type_=Z;this.x0_=0;this.y0_=0;this.r0_=0;this.x1_=0;this.y1_=0;this.r1_=0;this.colors_=[]}v.prototype.addColorStop=function(i,Z){Z=Y(Z);this.colors_.push({offset:i,color:Z.color,alpha:Z.alpha})};function u(i,Z){q(i);switch(Z){case"repeat":case null:case"":this.repetition_="repeat";break;case"repeat-x":case"repeat-y":case"no-repeat":this.repetition_=Z;break;default:n("SYNTAX_ERR")}this.src_=i.src;this.width_=i.width;this.height_=i.height}function n(Z){throw new o(Z)}function q(Z){if(!Z||Z.nodeType!=1||Z.tagName!="IMG"){n("TYPE_MISMATCH_ERR")}if(Z.readyState!="complete"){n("INVALID_STATE_ERR")}}function o(Z){this.code=this[Z];this.message=Z+": DOM Exception "+this.code}var x=o.prototype=new Error;x.INDEX_SIZE_ERR=1;x.DOMSTRING_SIZE_ERR=2;x.HIERARCHY_REQUEST_ERR=3;x.WRONG_DOCUMENT_ERR=4;x.INVALID_CHARACTER_ERR=5;x.NO_DATA_ALLOWED_ERR=6;x.NO_MODIFICATION_ALLOWED_ERR=7;x.NOT_FOUND_ERR=8;x.NOT_SUPPORTED_ERR=9;x.INUSE_ATTRIBUTE_ERR=10;x.INVALID_STATE_ERR=11;x.SYNTAX_ERR=12;x.INVALID_MODIFICATION_ERR=13;x.NAMESPACE_ERR=14;x.INVALID_ACCESS_ERR=15;x.VALIDATION_ERR=16;x.TYPE_MISMATCH_ERR=17;G_vmlCanvasManager=E;CanvasRenderingContext2D=W;CanvasGradient=v;CanvasPattern=u;DOMException=o})()}; \ No newline at end of file diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.js b/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.js new file mode 100644 index 00000000..52cbe82a --- /dev/null +++ b/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.js @@ -0,0 +1,2548 @@ +/* Javascript plotting library for jQuery, v. 0.6. + * + * Released under the MIT license by IOLA, December 2007. + * + */ + +// first an inline dependency, jquery.colorhelpers.js, we inline it here +// for convenience + +/* Plugin for jQuery for working with colors. + * + * Version 1.0. + * + * Inspiration from jQuery color animation plugin by John Resig. + * + * Released under the MIT license by Ole Laursen, October 2009. + * + * Examples: + * + * $.color.parse("#fff").scale('rgb', 0.25).add('a', -0.5).toString() + * var c = $.color.extract($("#mydiv"), 'background-color'); + * console.log(c.r, c.g, c.b, c.a); + * $.color.make(100, 50, 25, 0.4).toString() // returns "rgba(100,50,25,0.4)" + * + * Note that .scale() and .add() work in-place instead of returning + * new objects. + */ +(function($){$.color={};$.color.make=function(E,D,B,C){var F={};F.r=E||0;F.g=D||0;F.b=B||0;F.a=C!=null?C:1;F.add=function(I,H){for(var G=0;G=1){return"rgb("+[F.r,F.g,F.b].join(",")+")"}else{return"rgba("+[F.r,F.g,F.b,F.a].join(",")+")"}};F.normalize=function(){function G(I,J,H){return JH?H:J)}F.r=G(0,parseInt(F.r),255);F.g=G(0,parseInt(F.g),255);F.b=G(0,parseInt(F.b),255);F.a=G(0,F.a,1);return F};F.clone=function(){return $.color.make(F.r,F.b,F.g,F.a)};return F.normalize()};$.color.extract=function(C,B){var D;do{D=C.css(B).toLowerCase();if(D!=""&&D!="transparent"){break}C=C.parent()}while(!$.nodeName(C.get(0),"body"));if(D=="rgba(0, 0, 0, 0)"){D="transparent"}return $.color.parse(D)};$.color.parse=function(E){var D,B=$.color.make;if(D=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10))}if(D=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10),parseFloat(D[4]))}if(D=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55)}if(D=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55,parseFloat(D[4]))}if(D=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(E)){return B(parseInt(D[1],16),parseInt(D[2],16),parseInt(D[3],16))}if(D=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(E)){return B(parseInt(D[1]+D[1],16),parseInt(D[2]+D[2],16),parseInt(D[3]+D[3],16))}var C=$.trim(E).toLowerCase();if(C=="transparent"){return B(255,255,255,0)}else{D=A[C];return B(D[0],D[1],D[2])}};var A={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery); + +// the actual Flot code +(function($) { + function Plot(placeholder, data_, options_, plugins) { + // data is on the form: + // [ series1, series2 ... ] + // where series is either just the data as [ [x1, y1], [x2, y2], ... ] + // or { data: [ [x1, y1], [x2, y2], ... ], label: "some label", ... } + + var series = [], + options = { + // the color theme used for graphs + colors: ["#edc240", "#afd8f8", "#cb4b4b", "#4da74d", "#9440ed"], + legend: { + show: true, + noColumns: 1, // number of colums in legend table + labelFormatter: null, // fn: string -> string + labelBoxBorderColor: "#ccc", // border color for the little label boxes + container: null, // container (as jQuery object) to put legend in, null means default on top of graph + position: "ne", // position of default legend container within plot + margin: 5, // distance from grid edge to default legend container within plot + backgroundColor: null, // null means auto-detect + backgroundOpacity: 0.85 // set to 0 to avoid background + }, + xaxis: { + position: "bottom", // or "top" + mode: null, // null or "time" + color: null, // base color, labels, ticks + tickColor: null, // possibly different color of ticks, e.g. "rgba(0,0,0,0.15)" + transform: null, // null or f: number -> number to transform axis + inverseTransform: null, // if transform is set, this should be the inverse function + min: null, // min. value to show, null means set automatically + max: null, // max. value to show, null means set automatically + autoscaleMargin: null, // margin in % to add if auto-setting min/max + ticks: null, // either [1, 3] or [[1, "a"], 3] or (fn: axis info -> ticks) or app. number of ticks for auto-ticks + tickFormatter: null, // fn: number -> string + labelWidth: null, // size of tick labels in pixels + labelHeight: null, + tickLength: null, // size in pixels of ticks, or "full" for whole line + alignTicksWithAxis: null, // axis number or null for no sync + + // mode specific options + tickDecimals: null, // no. of decimals, null means auto + tickSize: null, // number or [number, "unit"] + minTickSize: null, // number or [number, "unit"] + monthNames: null, // list of names of months + timeformat: null, // format string to use + twelveHourClock: false // 12 or 24 time in time mode + }, + yaxis: { + autoscaleMargin: 0.02, + position: "left" // or "right" + }, + xaxes: [], + yaxes: [], + series: { + points: { + show: false, + radius: 3, + lineWidth: 2, // in pixels + fill: true, + fillColor: "#ffffff", + symbol: "circle" // or callback + }, + lines: { + // we don't put in show: false so we can see + // whether lines were actively disabled + lineWidth: 2, // in pixels + fill: false, + fillColor: null, + steps: false + }, + bars: { + show: false, + lineWidth: 2, // in pixels + barWidth: 1, // in units of the x axis + fill: true, + fillColor: null, + align: "left", // or "center" + horizontal: false + }, + shadowSize: 3 + }, + grid: { + show: true, + aboveData: false, + color: "#545454", // primary color used for outline and labels + backgroundColor: null, // null for transparent, else color + borderColor: null, // set if different from the grid color + tickColor: null, // color for the ticks, e.g. "rgba(0,0,0,0.15)" + labelMargin: 5, // in pixels + axisMargin: 8, // in pixels + borderWidth: 2, // in pixels + markings: null, // array of ranges or fn: axes -> array of ranges + markingsColor: "#f4f4f4", + markingsLineWidth: 2, + // interactive stuff + clickable: false, + hoverable: false, + autoHighlight: true, // highlight in case mouse is near + mouseActiveRadius: 10 // how far the mouse can be away to activate an item + }, + hooks: {} + }, + canvas = null, // the canvas for the plot itself + overlay = null, // canvas for interactive stuff on top of plot + eventHolder = null, // jQuery object that events should be bound to + ctx = null, octx = null, + xaxes = [], yaxes = [], + plotOffset = { left: 0, right: 0, top: 0, bottom: 0}, + canvasWidth = 0, canvasHeight = 0, + plotWidth = 0, plotHeight = 0, + hooks = { + processOptions: [], + processRawData: [], + processDatapoints: [], + drawSeries: [], + draw: [], + bindEvents: [], + drawOverlay: [] + }, + plot = this; + + // public functions + plot.setData = setData; + plot.setupGrid = setupGrid; + plot.draw = draw; + plot.getPlaceholder = function() { return placeholder; }; + plot.getCanvas = function() { return canvas; }; + plot.getPlotOffset = function() { return plotOffset; }; + plot.width = function () { return plotWidth; }; + plot.height = function () { return plotHeight; }; + plot.offset = function () { + var o = eventHolder.offset(); + o.left += plotOffset.left; + o.top += plotOffset.top; + return o; + }; + plot.getData = function () { return series; }; + plot.getAxis = function (dir, number) { + var a = (dir == "x" ? xaxes : yaxes)[number - 1]; + if (a && !a.used) + a = null; + return a; + }; + plot.getAxes = function () { + var res = {}, i; + for (i = 0; i < xaxes.length; ++i) + res["x" + (i ? (i + 1) : "") + "axis"] = xaxes[i] || {}; + for (i = 0; i < yaxes.length; ++i) + res["y" + (i ? (i + 1) : "") + "axis"] = yaxes[i] || {}; + + // backwards compatibility - to be removed + if (!res.x2axis) + res.x2axis = { n: 2 }; + if (!res.y2axis) + res.y2axis = { n: 2 }; + + return res; + }; + plot.getXAxes = function () { return xaxes; }; + plot.getYAxes = function () { return yaxes; }; + plot.getUsedAxes = getUsedAxes; // return flat array with x and y axes that are in use + plot.c2p = canvasToAxisCoords; + plot.p2c = axisToCanvasCoords; + plot.getOptions = function () { return options; }; + plot.highlight = highlight; + plot.unhighlight = unhighlight; + plot.triggerRedrawOverlay = triggerRedrawOverlay; + plot.pointOffset = function(point) { + return { + left: parseInt(xaxes[axisNumber(point, "x") - 1].p2c(+point.x) + plotOffset.left), + top: parseInt(yaxes[axisNumber(point, "y") - 1].p2c(+point.y) + plotOffset.top) + }; + }; + + // public attributes + plot.hooks = hooks; + + // initialize + initPlugins(plot); + parseOptions(options_); + constructCanvas(); + setData(data_); + setupGrid(); + draw(); + bindEvents(); + + + function executeHooks(hook, args) { + args = [plot].concat(args); + for (var i = 0; i < hook.length; ++i) + hook[i].apply(this, args); + } + + function initPlugins() { + for (var i = 0; i < plugins.length; ++i) { + var p = plugins[i]; + p.init(plot); + if (p.options) + $.extend(true, options, p.options); + } + } + + function parseOptions(opts) { + var i; + + $.extend(true, options, opts); + + if (options.xaxis.color == null) + options.xaxis.color = options.grid.color; + if (options.yaxis.color == null) + options.yaxis.color = options.grid.color; + + if (options.xaxis.tickColor == null) // backwards-compatibility + options.xaxis.tickColor = options.grid.tickColor; + if (options.yaxis.tickColor == null) // backwards-compatibility + options.yaxis.tickColor = options.grid.tickColor; + + if (options.grid.borderColor == null) + options.grid.borderColor = options.grid.color; + if (options.grid.tickColor == null) + options.grid.tickColor = $.color.parse(options.grid.color).scale('a', 0.22).toString(); + + // fill in defaults in axes, copy at least always the + // first as the rest of the code assumes it'll be there + for (i = 0; i < Math.max(1, options.xaxes.length); ++i) + options.xaxes[i] = $.extend(true, {}, options.xaxis, options.xaxes[i]); + for (i = 0; i < Math.max(1, options.yaxes.length); ++i) + options.yaxes[i] = $.extend(true, {}, options.yaxis, options.yaxes[i]); + // backwards compatibility, to be removed in future + if (options.xaxis.noTicks && options.xaxis.ticks == null) + options.xaxis.ticks = options.xaxis.noTicks; + if (options.yaxis.noTicks && options.yaxis.ticks == null) + options.yaxis.ticks = options.yaxis.noTicks; + if (options.x2axis) { + options.x2axis.position = "top"; + options.xaxes[1] = options.x2axis; + } + if (options.y2axis) { + if (options.y2axis.autoscaleMargin === undefined) + options.y2axis.autoscaleMargin = 0.02; + options.y2axis.position = "right"; + options.yaxes[1] = options.y2axis; + } + if (options.grid.coloredAreas) + options.grid.markings = options.grid.coloredAreas; + if (options.grid.coloredAreasColor) + options.grid.markingsColor = options.grid.coloredAreasColor; + if (options.lines) + $.extend(true, options.series.lines, options.lines); + if (options.points) + $.extend(true, options.series.points, options.points); + if (options.bars) + $.extend(true, options.series.bars, options.bars); + if (options.shadowSize != null) + options.series.shadowSize = options.shadowSize; + + for (i = 0; i < options.xaxes.length; ++i) + getOrCreateAxis(xaxes, i + 1).options = options.xaxes[i]; + for (i = 0; i < options.yaxes.length; ++i) + getOrCreateAxis(yaxes, i + 1).options = options.yaxes[i]; + + // add hooks from options + for (var n in hooks) + if (options.hooks[n] && options.hooks[n].length) + hooks[n] = hooks[n].concat(options.hooks[n]); + + executeHooks(hooks.processOptions, [options]); + } + + function setData(d) { + series = parseData(d); + fillInSeriesOptions(); + processData(); + } + + function parseData(d) { + var res = []; + for (var i = 0; i < d.length; ++i) { + var s = $.extend(true, {}, options.series); + + if (d[i].data != null) { + s.data = d[i].data; // move the data instead of deep-copy + delete d[i].data; + + $.extend(true, s, d[i]); + + d[i].data = s.data; + } + else + s.data = d[i]; + res.push(s); + } + + return res; + } + + function axisNumber(obj, coord) { + var a = obj[coord + "axis"]; + if (typeof a == "object") // if we got a real axis, extract number + a = a.n; + if (typeof a != "number") + a = 1; // default to first axis + return a; + } + + function canvasToAxisCoords(pos) { + // return an object with x/y corresponding to all used axes + var res = {}, i, axis; + for (i = 0; i < xaxes.length; ++i) { + axis = xaxes[i]; + if (axis && axis.used) + res["x" + axis.n] = axis.c2p(pos.left); + } + + for (i = 0; i < yaxes.length; ++i) { + axis = yaxes[i]; + if (axis && axis.used) + res["y" + axis.n] = axis.c2p(pos.top); + } + + if (res.x1 !== undefined) + res.x = res.x1; + if (res.y1 !== undefined) + res.y = res.y1; + + return res; + } + + function axisToCanvasCoords(pos) { + // get canvas coords from the first pair of x/y found in pos + var res = {}, i, axis, key; + + for (i = 0; i < xaxes.length; ++i) { + axis = xaxes[i]; + if (axis && axis.used) { + key = "x" + axis.n; + if (pos[key] == null && axis.n == 1) + key = "x"; + + if (pos[key] != null) { + res.left = axis.p2c(pos[key]); + break; + } + } + } + + for (i = 0; i < yaxes.length; ++i) { + axis = yaxes[i]; + if (axis && axis.used) { + key = "y" + axis.n; + if (pos[key] == null && axis.n == 1) + key = "y"; + + if (pos[key] != null) { + res.top = axis.p2c(pos[key]); + break; + } + } + } + + return res; + } + + function getUsedAxes() { + var res = [], i, axis; + for (i = 0; i < xaxes.length; ++i) { + axis = xaxes[i]; + if (axis && axis.used) + res.push(axis); + } + for (i = 0; i < yaxes.length; ++i) { + axis = yaxes[i]; + if (axis && axis.used) + res.push(axis); + } + return res; + } + + function getOrCreateAxis(axes, number) { + if (!axes[number - 1]) + axes[number - 1] = { + n: number, // save the number for future reference + direction: axes == xaxes ? "x" : "y", + options: $.extend(true, {}, axes == xaxes ? options.xaxis : options.yaxis) + }; + + return axes[number - 1]; + } + + function fillInSeriesOptions() { + var i; + + // collect what we already got of colors + var neededColors = series.length, + usedColors = [], + assignedColors = []; + for (i = 0; i < series.length; ++i) { + var sc = series[i].color; + if (sc != null) { + --neededColors; + if (typeof sc == "number") + assignedColors.push(sc); + else + usedColors.push($.color.parse(series[i].color)); + } + } + + // we might need to generate more colors if higher indices + // are assigned + for (i = 0; i < assignedColors.length; ++i) { + neededColors = Math.max(neededColors, assignedColors[i] + 1); + } + + // produce colors as needed + var colors = [], variation = 0; + i = 0; + while (colors.length < neededColors) { + var c; + if (options.colors.length == i) // check degenerate case + c = $.color.make(100, 100, 100); + else + c = $.color.parse(options.colors[i]); + + // vary color if needed + var sign = variation % 2 == 1 ? -1 : 1; + c.scale('rgb', 1 + sign * Math.ceil(variation / 2) * 0.2) + + // FIXME: if we're getting to close to something else, + // we should probably skip this one + colors.push(c); + + ++i; + if (i >= options.colors.length) { + i = 0; + ++variation; + } + } + + // fill in the options + var colori = 0, s; + for (i = 0; i < series.length; ++i) { + s = series[i]; + + // assign colors + if (s.color == null) { + s.color = colors[colori].toString(); + ++colori; + } + else if (typeof s.color == "number") + s.color = colors[s.color].toString(); + + // turn on lines automatically in case nothing is set + if (s.lines.show == null) { + var v, show = true; + for (v in s) + if (s[v] && s[v].show) { + show = false; + break; + } + if (show) + s.lines.show = true; + } + + // setup axes + s.xaxis = getOrCreateAxis(xaxes, axisNumber(s, "x")); + s.yaxis = getOrCreateAxis(yaxes, axisNumber(s, "y")); + } + } + + function processData() { + var topSentry = Number.POSITIVE_INFINITY, + bottomSentry = Number.NEGATIVE_INFINITY, + i, j, k, m, length, + s, points, ps, x, y, axis, val, f, p; + + function initAxis(axis, number) { + if (!axis) + return; + + axis.datamin = topSentry; + axis.datamax = bottomSentry; + axis.used = false; + } + + function updateAxis(axis, min, max) { + if (min < axis.datamin) + axis.datamin = min; + if (max > axis.datamax) + axis.datamax = max; + } + + for (i = 0; i < xaxes.length; ++i) + initAxis(xaxes[i]); + for (i = 0; i < yaxes.length; ++i) + initAxis(yaxes[i]); + + for (i = 0; i < series.length; ++i) { + s = series[i]; + s.datapoints = { points: [] }; + + executeHooks(hooks.processRawData, [ s, s.data, s.datapoints ]); + } + + // first pass: clean and copy data + for (i = 0; i < series.length; ++i) { + s = series[i]; + + var data = s.data, format = s.datapoints.format; + + if (!format) { + format = []; + // find out how to copy + format.push({ x: true, number: true, required: true }); + format.push({ y: true, number: true, required: true }); + + if (s.bars.show || (s.lines.show && s.lines.fill)) { + format.push({ y: true, number: true, required: false, defaultValue: 0 }); + if (s.bars.horizontal) { + delete format[format.length - 1].y; + format[format.length - 1].x = true; + } + } + + s.datapoints.format = format; + } + + if (s.datapoints.pointsize != null) + continue; // already filled in + + s.datapoints.pointsize = format.length; + + ps = s.datapoints.pointsize; + points = s.datapoints.points; + + insertSteps = s.lines.show && s.lines.steps; + s.xaxis.used = s.yaxis.used = true; + + for (j = k = 0; j < data.length; ++j, k += ps) { + p = data[j]; + + var nullify = p == null; + if (!nullify) { + for (m = 0; m < ps; ++m) { + val = p[m]; + f = format[m]; + + if (f) { + if (f.number && val != null) { + val = +val; // convert to number + if (isNaN(val)) + val = null; + } + + if (val == null) { + if (f.required) + nullify = true; + + if (f.defaultValue != null) + val = f.defaultValue; + } + } + + points[k + m] = val; + } + } + + if (nullify) { + for (m = 0; m < ps; ++m) { + val = points[k + m]; + if (val != null) { + f = format[m]; + // extract min/max info + if (f.x) + updateAxis(s.xaxis, val, val); + if (f.y) + updateAxis(s.yaxis, val, val); + } + points[k + m] = null; + } + } + else { + // a little bit of line specific stuff that + // perhaps shouldn't be here, but lacking + // better means... + if (insertSteps && k > 0 + && points[k - ps] != null + && points[k - ps] != points[k] + && points[k - ps + 1] != points[k + 1]) { + // copy the point to make room for a middle point + for (m = 0; m < ps; ++m) + points[k + ps + m] = points[k + m]; + + // middle point has same y + points[k + 1] = points[k - ps + 1]; + + // we've added a point, better reflect that + k += ps; + } + } + } + } + + // give the hooks a chance to run + for (i = 0; i < series.length; ++i) { + s = series[i]; + + executeHooks(hooks.processDatapoints, [ s, s.datapoints]); + } + + // second pass: find datamax/datamin for auto-scaling + for (i = 0; i < series.length; ++i) { + s = series[i]; + points = s.datapoints.points, + ps = s.datapoints.pointsize; + + var xmin = topSentry, ymin = topSentry, + xmax = bottomSentry, ymax = bottomSentry; + + for (j = 0; j < points.length; j += ps) { + if (points[j] == null) + continue; + + for (m = 0; m < ps; ++m) { + val = points[j + m]; + f = format[m]; + if (!f) + continue; + + if (f.x) { + if (val < xmin) + xmin = val; + if (val > xmax) + xmax = val; + } + if (f.y) { + if (val < ymin) + ymin = val; + if (val > ymax) + ymax = val; + } + } + } + + if (s.bars.show) { + // make sure we got room for the bar on the dancing floor + var delta = s.bars.align == "left" ? 0 : -s.bars.barWidth/2; + if (s.bars.horizontal) { + ymin += delta; + ymax += delta + s.bars.barWidth; + } + else { + xmin += delta; + xmax += delta + s.bars.barWidth; + } + } + + updateAxis(s.xaxis, xmin, xmax); + updateAxis(s.yaxis, ymin, ymax); + } + + $.each(getUsedAxes(), function (i, axis) { + if (axis.datamin == topSentry) + axis.datamin = null; + if (axis.datamax == bottomSentry) + axis.datamax = null; + }); + } + + function constructCanvas() { + canvasWidth = placeholder.width(); + canvasHeight = placeholder.height(); + + // excanvas hack, if there are any canvases here, whack + // the state on them manually + if (window.G_vmlCanvasManager) + placeholder.find("canvas").each(function () { + this.context_ = null; + }); + + placeholder.html(""); // clear placeholder + + if (placeholder.css("position") == 'static') + placeholder.css("position", "relative"); // for positioning labels and overlay + + if (canvasWidth <= 0 || canvasHeight <= 0) + throw "Invalid dimensions for plot, width = " + canvasWidth + ", height = " + canvasHeight; + + function makeCanvas(skipPositioning) { + var c = document.createElement('canvas'); + c.width = canvasWidth; + c.height = canvasHeight; + + if (!skipPositioning) + $(c).css({ position: 'absolute', left: 0, top: 0 }); + + $(c).appendTo(placeholder); + + if (!c.getContext) // excanvas hack + c = window.G_vmlCanvasManager.initElement(c); + + return c; + } + + // the canvas + canvas = makeCanvas(true); + ctx = canvas.getContext("2d"); + + // overlay canvas for interactive features + overlay = makeCanvas(); + octx = overlay.getContext("2d"); + } + + function bindEvents() { + // we include the canvas in the event holder too, because IE 7 + // sometimes has trouble with the stacking order + eventHolder = $([overlay, canvas]); + + // bind events + if (options.grid.hoverable) { + eventHolder.mousemove(onMouseMove); + eventHolder.mouseleave(onMouseLeave); + } + + if (options.grid.clickable) + eventHolder.click(onClick); + + executeHooks(hooks.bindEvents, [eventHolder]); + } + + function setTransformationHelpers(axis) { + // set helper functions on the axis, assumes plot area + // has been computed already + + function identity(x) { return x; } + + var s, m, t = axis.options.transform || identity, + it = axis.options.inverseTransform; + + if (axis.direction == "x") { + // precompute how much the axis is scaling a point + // in canvas space + s = axis.scale = plotWidth / (t(axis.max) - t(axis.min)); + m = t(axis.min); + + // data point to canvas coordinate + if (t == identity) // slight optimization + axis.p2c = function (p) { return (p - m) * s; }; + else + axis.p2c = function (p) { return (t(p) - m) * s; }; + // canvas coordinate to data point + if (!it) + axis.c2p = function (c) { return m + c / s; }; + else + axis.c2p = function (c) { return it(m + c / s); }; + } + else { + s = axis.scale = plotHeight / (t(axis.max) - t(axis.min)); + m = t(axis.max); + + if (t == identity) + axis.p2c = function (p) { return (m - p) * s; }; + else + axis.p2c = function (p) { return (m - t(p)) * s; }; + if (!it) + axis.c2p = function (c) { return m - c / s; }; + else + axis.c2p = function (c) { return it(m - c / s); }; + } + } + + function measureTickLabels(axis) { + if (!axis) + return; + + var opts = axis.options, i, ticks = axis.ticks || [], labels = [], + l, w = opts.labelWidth, h = opts.labelHeight, dummyDiv; + + function makeDummyDiv(labels, width) { + return $('
' + + '
' + + labels.join("") + '
') + .appendTo(placeholder); + } + + if (axis.direction == "x") { + // to avoid measuring the widths of the labels (it's slow), we + // construct fixed-size boxes and put the labels inside + // them, we don't need the exact figures and the + // fixed-size box content is easy to center + if (w == null) + w = Math.floor(canvasWidth / (ticks.length > 0 ? ticks.length : 1)); + + // measure x label heights + if (h == null) { + labels = []; + for (i = 0; i < ticks.length; ++i) { + l = ticks[i].label; + if (l) + labels.push('
' + l + '
'); + } + + if (labels.length > 0) { + // stick them all in the same div and measure + // collective height + labels.push('
'); + dummyDiv = makeDummyDiv(labels, "width:10000px;"); + h = dummyDiv.height(); + dummyDiv.remove(); + } + } + } + else if (w == null || h == null) { + // calculate y label dimensions + for (i = 0; i < ticks.length; ++i) { + l = ticks[i].label; + if (l) + labels.push('
' + l + '
'); + } + + if (labels.length > 0) { + dummyDiv = makeDummyDiv(labels, ""); + if (w == null) + w = dummyDiv.children().width(); + if (h == null) + h = dummyDiv.find("div.tickLabel").height(); + dummyDiv.remove(); + } + } + + if (w == null) + w = 0; + if (h == null) + h = 0; + + axis.labelWidth = w; + axis.labelHeight = h; + } + + function computeAxisBox(axis) { + if (!axis || !axis.labelWidth || !axis.labelHeight) + return; + + // find the bounding box of the axis by looking at label + // widths/heights and ticks, make room by diminishing the + // plotOffset + + var lw = axis.labelWidth, + lh = axis.labelHeight, + pos = axis.options.position, + tickLength = axis.options.tickLength, + axismargin = options.grid.axisMargin, + padding = options.grid.labelMargin, + all = axis.direction == "x" ? xaxes : yaxes, + index; + + // determine axis margin + var samePosition = $.grep(all, function (a) { + return a && a.options.position == pos && (a.labelHeight || a.labelWidth); + }); + if ($.inArray(axis, samePosition) == samePosition.length - 1) + axismargin = 0; // outermost + + // determine tick length - if we're innermost, we can use "full" + if (tickLength == null) + tickLength = "full"; + + var sameDirection = $.grep(all, function (a) { + return a && (a.labelHeight || a.labelWidth); + }); + + var innermost = $.inArray(axis, sameDirection) == 0; + if (!innermost && tickLength == "full") + tickLength = 5; + + if (!isNaN(+tickLength)) + padding += +tickLength; + + // compute box + if (axis.direction == "x") { + lh += padding; + + if (pos == "bottom") { + plotOffset.bottom += lh + axismargin; + axis.box = { top: canvasHeight - plotOffset.bottom, height: lh }; + } + else { + axis.box = { top: plotOffset.top + axismargin, height: lh }; + plotOffset.top += lh + axismargin; + } + } + else { + lw += padding; + + if (pos == "left") { + axis.box = { left: plotOffset.left + axismargin, width: lw }; + plotOffset.left += lw + axismargin; + } + else { + plotOffset.right += lw + axismargin; + axis.box = { left: canvasWidth - plotOffset.right, width: lw }; + } + } + + // save for future reference + axis.position = pos; + axis.tickLength = tickLength; + axis.box.padding = padding; + axis.innermost = innermost; + } + + function fixupAxisBox(axis) { + if (!axis || !axis.labelWidth || !axis.labelHeight) + return; + + // set remaining bounding box coordinates + if (axis.direction == "x") { + axis.box.left = plotOffset.left; + axis.box.width = plotWidth; + } + else { + axis.box.top = plotOffset.top; + axis.box.height = plotHeight; + } + } + + function setupGrid() { + var axes = getUsedAxes(), j, k; + + // compute axis intervals + for (k = 0; k < axes.length; ++k) + setRange(axes[k]); + + + plotOffset.left = plotOffset.right = plotOffset.top = plotOffset.bottom = 0; + if (options.grid.show) { + // make the ticks + for (k = 0; k < axes.length; ++k) { + setupTickGeneration(axes[k]); + setTicks(axes[k]); + snapRangeToTicks(axes[k], axes[k].ticks); + } + + // find labelWidth/Height, do this on all, not just + // used as we might need to reserve space for unused + // too if their labelWidth/Height is set + for (j = 0; j < xaxes.length; ++j) + measureTickLabels(xaxes[j]); + for (j = 0; j < yaxes.length; ++j) + measureTickLabels(yaxes[j]); + + // compute the axis boxes, start from the outside (reverse order) + for (j = xaxes.length - 1; j >= 0; --j) + computeAxisBox(xaxes[j]); + for (j = yaxes.length - 1; j >= 0; --j) + computeAxisBox(yaxes[j]); + + // make sure we've got enough space for things that + // might stick out + var maxOutset = 0; + for (var i = 0; i < series.length; ++i) + maxOutset = Math.max(maxOutset, 2 * (series[i].points.radius + series[i].points.lineWidth/2)); + + for (var a in plotOffset) { + plotOffset[a] += options.grid.borderWidth; + plotOffset[a] = Math.max(maxOutset, plotOffset[a]); + } + } + + plotWidth = canvasWidth - plotOffset.left - plotOffset.right; + plotHeight = canvasHeight - plotOffset.bottom - plotOffset.top; + + // now we got the proper plotWidth/Height, we can compute the scaling + for (k = 0; k < axes.length; ++k) + setTransformationHelpers(axes[k]); + + if (options.grid.show) { + for (k = 0; k < axes.length; ++k) + fixupAxisBox(axes[k]); + + insertAxisLabels(); + } + + insertLegend(); + } + + function setRange(axis) { + var opts = axis.options, + min = +(opts.min != null ? opts.min : axis.datamin), + max = +(opts.max != null ? opts.max : axis.datamax), + delta = max - min; + + if (delta == 0.0) { + // degenerate case + var widen = max == 0 ? 1 : 0.01; + + if (opts.min == null) + min -= widen; + // alway widen max if we couldn't widen min to ensure we + // don't fall into min == max which doesn't work + if (opts.max == null || opts.min != null) + max += widen; + } + else { + // consider autoscaling + var margin = opts.autoscaleMargin; + if (margin != null) { + if (opts.min == null) { + min -= delta * margin; + // make sure we don't go below zero if all values + // are positive + if (min < 0 && axis.datamin != null && axis.datamin >= 0) + min = 0; + } + if (opts.max == null) { + max += delta * margin; + if (max > 0 && axis.datamax != null && axis.datamax <= 0) + max = 0; + } + } + } + axis.min = min; + axis.max = max; + } + + function setupTickGeneration(axis) { + var opts = axis.options; + + // estimate number of ticks + var noTicks; + if (typeof opts.ticks == "number" && opts.ticks > 0) + noTicks = opts.ticks; + else if (axis.direction == "x") + // heuristic based on the model a*sqrt(x) fitted to + // some reasonable data points + noTicks = 0.3 * Math.sqrt(canvasWidth); + else + noTicks = 0.3 * Math.sqrt(canvasHeight); + + var delta = (axis.max - axis.min) / noTicks, + size, generator, unit, formatter, i, magn, norm; + + if (opts.mode == "time") { + // pretty handling of time + + // map of app. size of time units in milliseconds + var timeUnitSize = { + "second": 1000, + "minute": 60 * 1000, + "hour": 60 * 60 * 1000, + "day": 24 * 60 * 60 * 1000, + "month": 30 * 24 * 60 * 60 * 1000, + "year": 365.2425 * 24 * 60 * 60 * 1000 + }; + + + // the allowed tick sizes, after 1 year we use + // an integer algorithm + var spec = [ + [1, "second"], [2, "second"], [5, "second"], [10, "second"], + [30, "second"], + [1, "minute"], [2, "minute"], [5, "minute"], [10, "minute"], + [30, "minute"], + [1, "hour"], [2, "hour"], [4, "hour"], + [8, "hour"], [12, "hour"], + [1, "day"], [2, "day"], [3, "day"], + [0.25, "month"], [0.5, "month"], [1, "month"], + [2, "month"], [3, "month"], [6, "month"], + [1, "year"] + ]; + + var minSize = 0; + if (opts.minTickSize != null) { + if (typeof opts.tickSize == "number") + minSize = opts.tickSize; + else + minSize = opts.minTickSize[0] * timeUnitSize[opts.minTickSize[1]]; + } + + for (var i = 0; i < spec.length - 1; ++i) + if (delta < (spec[i][0] * timeUnitSize[spec[i][1]] + + spec[i + 1][0] * timeUnitSize[spec[i + 1][1]]) / 2 + && spec[i][0] * timeUnitSize[spec[i][1]] >= minSize) + break; + size = spec[i][0]; + unit = spec[i][1]; + + // special-case the possibility of several years + if (unit == "year") { + magn = Math.pow(10, Math.floor(Math.log(delta / timeUnitSize.year) / Math.LN10)); + norm = (delta / timeUnitSize.year) / magn; + if (norm < 1.5) + size = 1; + else if (norm < 3) + size = 2; + else if (norm < 7.5) + size = 5; + else + size = 10; + + size *= magn; + } + + axis.tickSize = opts.tickSize || [size, unit]; + + generator = function(axis) { + var ticks = [], + tickSize = axis.tickSize[0], unit = axis.tickSize[1], + d = new Date(axis.min); + + var step = tickSize * timeUnitSize[unit]; + + if (unit == "second") + d.setUTCSeconds(floorInBase(d.getUTCSeconds(), tickSize)); + if (unit == "minute") + d.setUTCMinutes(floorInBase(d.getUTCMinutes(), tickSize)); + if (unit == "hour") + d.setUTCHours(floorInBase(d.getUTCHours(), tickSize)); + if (unit == "month") + d.setUTCMonth(floorInBase(d.getUTCMonth(), tickSize)); + if (unit == "year") + d.setUTCFullYear(floorInBase(d.getUTCFullYear(), tickSize)); + + // reset smaller components + d.setUTCMilliseconds(0); + if (step >= timeUnitSize.minute) + d.setUTCSeconds(0); + if (step >= timeUnitSize.hour) + d.setUTCMinutes(0); + if (step >= timeUnitSize.day) + d.setUTCHours(0); + if (step >= timeUnitSize.day * 4) + d.setUTCDate(1); + if (step >= timeUnitSize.year) + d.setUTCMonth(0); + + + var carry = 0, v = Number.NaN, prev; + do { + prev = v; + v = d.getTime(); + ticks.push(v); + if (unit == "month") { + if (tickSize < 1) { + // a bit complicated - we'll divide the month + // up but we need to take care of fractions + // so we don't end up in the middle of a day + d.setUTCDate(1); + var start = d.getTime(); + d.setUTCMonth(d.getUTCMonth() + 1); + var end = d.getTime(); + d.setTime(v + carry * timeUnitSize.hour + (end - start) * tickSize); + carry = d.getUTCHours(); + d.setUTCHours(0); + } + else + d.setUTCMonth(d.getUTCMonth() + tickSize); + } + else if (unit == "year") { + d.setUTCFullYear(d.getUTCFullYear() + tickSize); + } + else + d.setTime(v + step); + } while (v < axis.max && v != prev); + + return ticks; + }; + + formatter = function (v, axis) { + var d = new Date(v); + + // first check global format + if (opts.timeformat != null) + return $.plot.formatDate(d, opts.timeformat, opts.monthNames); + + var t = axis.tickSize[0] * timeUnitSize[axis.tickSize[1]]; + var span = axis.max - axis.min; + var suffix = (opts.twelveHourClock) ? " %p" : ""; + + if (t < timeUnitSize.minute) + fmt = "%h:%M:%S" + suffix; + else if (t < timeUnitSize.day) { + if (span < 2 * timeUnitSize.day) + fmt = "%h:%M" + suffix; + else + fmt = "%b %d %h:%M" + suffix; + } + else if (t < timeUnitSize.month) + fmt = "%b %d"; + else if (t < timeUnitSize.year) { + if (span < timeUnitSize.year) + fmt = "%b"; + else + fmt = "%b %y"; + } + else + fmt = "%y"; + + return $.plot.formatDate(d, fmt, opts.monthNames); + }; + } + else { + // pretty rounding of base-10 numbers + var maxDec = opts.tickDecimals; + var dec = -Math.floor(Math.log(delta) / Math.LN10); + if (maxDec != null && dec > maxDec) + dec = maxDec; + + magn = Math.pow(10, -dec); + norm = delta / magn; // norm is between 1.0 and 10.0 + + if (norm < 1.5) + size = 1; + else if (norm < 3) { + size = 2; + // special case for 2.5, requires an extra decimal + if (norm > 2.25 && (maxDec == null || dec + 1 <= maxDec)) { + size = 2.5; + ++dec; + } + } + else if (norm < 7.5) + size = 5; + else + size = 10; + + size *= magn; + + if (opts.minTickSize != null && size < opts.minTickSize) + size = opts.minTickSize; + + axis.tickDecimals = Math.max(0, maxDec != null ? maxDec : dec); + axis.tickSize = opts.tickSize || size; + + generator = function (axis) { + var ticks = []; + + // spew out all possible ticks + var start = floorInBase(axis.min, axis.tickSize), + i = 0, v = Number.NaN, prev; + do { + prev = v; + v = start + i * axis.tickSize; + ticks.push(v); + ++i; + } while (v < axis.max && v != prev); + return ticks; + }; + + formatter = function (v, axis) { + return v.toFixed(axis.tickDecimals); + }; + } + + if (opts.alignTicksWithAxis != null) { + var otherAxis = (axis.direction == "x" ? xaxes : yaxes)[opts.alignTicksWithAxis - 1]; + if (otherAxis && otherAxis.used && otherAxis != axis) { + // consider snapping min/max to outermost nice ticks + var niceTicks = generator(axis); + if (niceTicks.length > 0) { + if (opts.min == null) + axis.min = Math.min(axis.min, niceTicks[0]); + if (opts.max == null && niceTicks.length > 1) + axis.max = Math.max(axis.max, niceTicks[niceTicks.length - 1]); + } + + generator = function (axis) { + // copy ticks, scaled to this axis + var ticks = [], v, i; + for (i = 0; i < otherAxis.ticks.length; ++i) { + v = (otherAxis.ticks[i].v - otherAxis.min) / (otherAxis.max - otherAxis.min); + v = axis.min + v * (axis.max - axis.min); + ticks.push(v); + } + return ticks; + }; + + // we might need an extra decimal since forced + // ticks don't necessarily fit naturally + if (axis.mode != "time" && opts.tickDecimals == null) { + var extraDec = Math.max(0, -Math.floor(Math.log(delta) / Math.LN10) + 1), + ts = generator(axis); + + // only proceed if the tick interval rounded + // with an extra decimal doesn't give us a + // zero at end + if (!(ts.length > 1 && /\..*0$/.test((ts[1] - ts[0]).toFixed(extraDec)))) + axis.tickDecimals = extraDec; + } + } + } + + axis.tickGenerator = generator; + if ($.isFunction(opts.tickFormatter)) + axis.tickFormatter = function (v, axis) { return "" + opts.tickFormatter(v, axis); }; + else + axis.tickFormatter = formatter; + } + + function setTicks(axis) { + axis.ticks = []; + + var oticks = axis.options.ticks, ticks = []; + if (oticks == null || (typeof oticks == "number" && oticks > 0)) + ticks = axis.tickGenerator(axis); + else if (oticks) { + if ($.isFunction(oticks)) + // generate the ticks + ticks = oticks({ min: axis.min, max: axis.max }); + else + ticks = oticks; + } + + // clean up/labelify the supplied ticks, copy them over + var i, v; + for (i = 0; i < ticks.length; ++i) { + var label = null; + var t = ticks[i]; + if (typeof t == "object") { + v = t[0]; + if (t.length > 1) + label = t[1]; + } + else + v = t; + if (label == null) + label = axis.tickFormatter(v, axis); + axis.ticks[i] = { v: v, label: label }; + } + } + + function snapRangeToTicks(axis, ticks) { + if (axis.options.autoscaleMargin && ticks.length > 0) { + // snap to ticks + if (axis.options.min == null) + axis.min = Math.min(axis.min, ticks[0].v); + if (axis.options.max == null && ticks.length > 1) + axis.max = Math.max(axis.max, ticks[ticks.length - 1].v); + } + } + + function draw() { + ctx.clearRect(0, 0, canvasWidth, canvasHeight); + + var grid = options.grid; + + // draw background, if any + if (grid.show && grid.backgroundColor) + drawBackground(); + + if (grid.show && !grid.aboveData) + drawGrid(); + + for (var i = 0; i < series.length; ++i) { + executeHooks(hooks.drawSeries, [ctx, series[i]]); + drawSeries(series[i]); + } + + executeHooks(hooks.draw, [ctx]); + + if (grid.show && grid.aboveData) + drawGrid(); + } + + function extractRange(ranges, coord) { + var axis, from, to, axes, key; + + axes = getUsedAxes(); + for (i = 0; i < axes.length; ++i) { + axis = axes[i]; + if (axis.direction == coord) { + key = coord + axis.n + "axis"; + if (!ranges[key] && axis.n == 1) + key = coord + "axis"; // support x1axis as xaxis + if (ranges[key]) { + from = ranges[key].from; + to = ranges[key].to; + break; + } + } + } + + // backwards-compat stuff - to be removed in future + if (!ranges[key]) { + axis = coord == "x" ? xaxes[0] : yaxes[0]; + from = ranges[coord + "1"]; + to = ranges[coord + "2"]; + } + + // auto-reverse as an added bonus + if (from != null && to != null && from > to) { + var tmp = from; + from = to; + to = tmp; + } + + return { from: from, to: to, axis: axis }; + } + + function drawBackground() { + ctx.save(); + ctx.translate(plotOffset.left, plotOffset.top); + + ctx.fillStyle = getColorOrGradient(options.grid.backgroundColor, plotHeight, 0, "rgba(255, 255, 255, 0)"); + ctx.fillRect(0, 0, plotWidth, plotHeight); + ctx.restore(); + } + + function drawGrid() { + var i; + + ctx.save(); + ctx.translate(plotOffset.left, plotOffset.top); + + // draw markings + var markings = options.grid.markings; + if (markings) { + if ($.isFunction(markings)) { + var axes = plot.getAxes(); + // xmin etc. is backwards compatibility, to be + // removed in the future + axes.xmin = axes.xaxis.min; + axes.xmax = axes.xaxis.max; + axes.ymin = axes.yaxis.min; + axes.ymax = axes.yaxis.max; + + markings = markings(axes); + } + + for (i = 0; i < markings.length; ++i) { + var m = markings[i], + xrange = extractRange(m, "x"), + yrange = extractRange(m, "y"); + + // fill in missing + if (xrange.from == null) + xrange.from = xrange.axis.min; + if (xrange.to == null) + xrange.to = xrange.axis.max; + if (yrange.from == null) + yrange.from = yrange.axis.min; + if (yrange.to == null) + yrange.to = yrange.axis.max; + + // clip + if (xrange.to < xrange.axis.min || xrange.from > xrange.axis.max || + yrange.to < yrange.axis.min || yrange.from > yrange.axis.max) + continue; + + xrange.from = Math.max(xrange.from, xrange.axis.min); + xrange.to = Math.min(xrange.to, xrange.axis.max); + yrange.from = Math.max(yrange.from, yrange.axis.min); + yrange.to = Math.min(yrange.to, yrange.axis.max); + + if (xrange.from == xrange.to && yrange.from == yrange.to) + continue; + + // then draw + xrange.from = xrange.axis.p2c(xrange.from); + xrange.to = xrange.axis.p2c(xrange.to); + yrange.from = yrange.axis.p2c(yrange.from); + yrange.to = yrange.axis.p2c(yrange.to); + + if (xrange.from == xrange.to || yrange.from == yrange.to) { + // draw line + ctx.beginPath(); + ctx.strokeStyle = m.color || options.grid.markingsColor; + ctx.lineWidth = m.lineWidth || options.grid.markingsLineWidth; + ctx.moveTo(xrange.from, yrange.from); + ctx.lineTo(xrange.to, yrange.to); + ctx.stroke(); + } + else { + // fill area + ctx.fillStyle = m.color || options.grid.markingsColor; + ctx.fillRect(xrange.from, yrange.to, + xrange.to - xrange.from, + yrange.from - yrange.to); + } + } + } + + // draw the ticks + var axes = getUsedAxes(), bw = options.grid.borderWidth; + + for (var j = 0; j < axes.length; ++j) { + var axis = axes[j], box = axis.box, + t = axis.tickLength, x, y, xoff, yoff; + + if (axis.ticks.length == 0) + continue; + + ctx.strokeStyle = axis.options.tickColor || $.color.parse(axis.options.color).scale('a', 0.22).toString(); + ctx.lineWidth = 1; + + // find the edges + if (axis.direction == "x") { + x = 0; + if (t == "full") + y = (axis.position == "top" ? 0 : plotHeight); + else + y = box.top - plotOffset.top + (axis.position == "top" ? box.height : 0); + } + else { + y = 0; + if (t == "full") + x = (axis.position == "left" ? 0 : plotWidth); + else + x = box.left - plotOffset.left + (axis.position == "left" ? box.width : 0); + } + + // draw tick bar + if (!axis.innermost) { + ctx.beginPath(); + xoff = yoff = 0; + if (axis.direction == "x") + xoff = plotWidth; + else + yoff = plotHeight; + + if (ctx.lineWidth == 1) { + x = Math.floor(x) + 0.5; + y = Math.floor(y) + 0.5; + } + + ctx.moveTo(x, y); + ctx.lineTo(x + xoff, y + yoff); + ctx.stroke(); + } + + // draw ticks + ctx.beginPath(); + for (i = 0; i < axis.ticks.length; ++i) { + var v = axis.ticks[i].v; + + xoff = yoff = 0; + + if (v < axis.min || v > axis.max + // skip those lying on the axes if we got a border + || (t == "full" && bw > 0 + && (v == axis.min || v == axis.max))) + continue; + + if (axis.direction == "x") { + x = axis.p2c(v); + yoff = t == "full" ? -plotHeight : t; + + if (axis.position == "top") + yoff = -yoff; + } + else { + y = axis.p2c(v); + xoff = t == "full" ? -plotWidth : t; + + if (axis.position == "left") + xoff = -xoff; + } + + if (ctx.lineWidth == 1) { + if (axis.direction == "x") + x = Math.floor(x) + 0.5; + else + y = Math.floor(y) + 0.5; + } + + ctx.moveTo(x, y); + ctx.lineTo(x + xoff, y + yoff); + } + + ctx.stroke(); + } + + + // draw border + if (bw) { + ctx.lineWidth = bw; + ctx.strokeStyle = options.grid.borderColor; + ctx.strokeRect(-bw/2, -bw/2, plotWidth + bw, plotHeight + bw); + } + + ctx.restore(); + } + + function insertAxisLabels() { + placeholder.find(".tickLabels").remove(); + + var html = ['
']; + + var axes = getUsedAxes(); + for (var j = 0; j < axes.length; ++j) { + var axis = axes[j], box = axis.box; + //debug: html.push('
') + html.push('
'); + for (var i = 0; i < axis.ticks.length; ++i) { + var tick = axis.ticks[i]; + if (!tick.label || tick.v < axis.min || tick.v > axis.max) + continue; + + var pos = {}, align; + + if (axis.direction == "x") { + align = "center"; + pos.left = Math.round(plotOffset.left + axis.p2c(tick.v) - axis.labelWidth/2); + if (axis.position == "bottom") + pos.top = box.top + box.padding; + else + pos.bottom = canvasHeight - (box.top + box.height - box.padding); + } + else { + pos.top = Math.round(plotOffset.top + axis.p2c(tick.v) - axis.labelHeight/2); + if (axis.position == "left") { + pos.right = canvasWidth - (box.left + box.width - box.padding) + align = "right"; + } + else { + pos.left = box.left + box.padding; + align = "left"; + } + } + + pos.width = axis.labelWidth; + + var style = ["position:absolute", "text-align:" + align ]; + for (var a in pos) + style.push(a + ":" + pos[a] + "px") + + html.push('
' + tick.label + '
'); + } + html.push('
'); + } + + html.push('
'); + + placeholder.append(html.join("")); + } + + function drawSeries(series) { + if (series.lines.show) + drawSeriesLines(series); + if (series.bars.show) + drawSeriesBars(series); + if (series.points.show) + drawSeriesPoints(series); + } + + function drawSeriesLines(series) { + function plotLine(datapoints, xoffset, yoffset, axisx, axisy) { + var points = datapoints.points, + ps = datapoints.pointsize, + prevx = null, prevy = null; + + ctx.beginPath(); + for (var i = ps; i < points.length; i += ps) { + var x1 = points[i - ps], y1 = points[i - ps + 1], + x2 = points[i], y2 = points[i + 1]; + + if (x1 == null || x2 == null) + continue; + + // clip with ymin + if (y1 <= y2 && y1 < axisy.min) { + if (y2 < axisy.min) + continue; // line segment is outside + // compute new intersection point + x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; + y1 = axisy.min; + } + else if (y2 <= y1 && y2 < axisy.min) { + if (y1 < axisy.min) + continue; + x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; + y2 = axisy.min; + } + + // clip with ymax + if (y1 >= y2 && y1 > axisy.max) { + if (y2 > axisy.max) + continue; + x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; + y1 = axisy.max; + } + else if (y2 >= y1 && y2 > axisy.max) { + if (y1 > axisy.max) + continue; + x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; + y2 = axisy.max; + } + + // clip with xmin + if (x1 <= x2 && x1 < axisx.min) { + if (x2 < axisx.min) + continue; + y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; + x1 = axisx.min; + } + else if (x2 <= x1 && x2 < axisx.min) { + if (x1 < axisx.min) + continue; + y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; + x2 = axisx.min; + } + + // clip with xmax + if (x1 >= x2 && x1 > axisx.max) { + if (x2 > axisx.max) + continue; + y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; + x1 = axisx.max; + } + else if (x2 >= x1 && x2 > axisx.max) { + if (x1 > axisx.max) + continue; + y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; + x2 = axisx.max; + } + + if (x1 != prevx || y1 != prevy) + ctx.moveTo(axisx.p2c(x1) + xoffset, axisy.p2c(y1) + yoffset); + + prevx = x2; + prevy = y2; + ctx.lineTo(axisx.p2c(x2) + xoffset, axisy.p2c(y2) + yoffset); + } + ctx.stroke(); + } + + function plotLineArea(datapoints, axisx, axisy) { + var points = datapoints.points, + ps = datapoints.pointsize, + bottom = Math.min(Math.max(0, axisy.min), axisy.max), + i = 0, top, areaOpen = false, + ypos = 1, segmentStart = 0, segmentEnd = 0; + + // we process each segment in two turns, first forward + // direction to sketch out top, then once we hit the + // end we go backwards to sketch the bottom + while (true) { + if (ps > 0 && i > points.length + ps) + break; + + i += ps; // ps is negative if going backwards + + var x1 = points[i - ps], + y1 = points[i - ps + ypos], + x2 = points[i], y2 = points[i + ypos]; + + if (areaOpen) { + if (ps > 0 && x1 != null && x2 == null) { + // at turning point + segmentEnd = i; + ps = -ps; + ypos = 2; + continue; + } + + if (ps < 0 && i == segmentStart + ps) { + // done with the reverse sweep + ctx.fill(); + areaOpen = false; + ps = -ps; + ypos = 1; + i = segmentStart = segmentEnd + ps; + continue; + } + } + + if (x1 == null || x2 == null) + continue; + + // clip x values + + // clip with xmin + if (x1 <= x2 && x1 < axisx.min) { + if (x2 < axisx.min) + continue; + y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; + x1 = axisx.min; + } + else if (x2 <= x1 && x2 < axisx.min) { + if (x1 < axisx.min) + continue; + y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; + x2 = axisx.min; + } + + // clip with xmax + if (x1 >= x2 && x1 > axisx.max) { + if (x2 > axisx.max) + continue; + y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; + x1 = axisx.max; + } + else if (x2 >= x1 && x2 > axisx.max) { + if (x1 > axisx.max) + continue; + y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; + x2 = axisx.max; + } + + if (!areaOpen) { + // open area + ctx.beginPath(); + ctx.moveTo(axisx.p2c(x1), axisy.p2c(bottom)); + areaOpen = true; + } + + // now first check the case where both is outside + if (y1 >= axisy.max && y2 >= axisy.max) { + ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.max)); + ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.max)); + continue; + } + else if (y1 <= axisy.min && y2 <= axisy.min) { + ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.min)); + ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.min)); + continue; + } + + // else it's a bit more complicated, there might + // be a flat maxed out rectangle first, then a + // triangular cutout or reverse; to find these + // keep track of the current x values + var x1old = x1, x2old = x2; + + // clip the y values, without shortcutting, we + // go through all cases in turn + + // clip with ymin + if (y1 <= y2 && y1 < axisy.min && y2 >= axisy.min) { + x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; + y1 = axisy.min; + } + else if (y2 <= y1 && y2 < axisy.min && y1 >= axisy.min) { + x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; + y2 = axisy.min; + } + + // clip with ymax + if (y1 >= y2 && y1 > axisy.max && y2 <= axisy.max) { + x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; + y1 = axisy.max; + } + else if (y2 >= y1 && y2 > axisy.max && y1 <= axisy.max) { + x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; + y2 = axisy.max; + } + + // if the x value was changed we got a rectangle + // to fill + if (x1 != x1old) { + ctx.lineTo(axisx.p2c(x1old), axisy.p2c(y1)); + // it goes to (x1, y1), but we fill that below + } + + // fill triangular section, this sometimes result + // in redundant points if (x1, y1) hasn't changed + // from previous line to, but we just ignore that + ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1)); + ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2)); + + // fill the other rectangle if it's there + if (x2 != x2old) { + ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2)); + ctx.lineTo(axisx.p2c(x2old), axisy.p2c(y2)); + } + } + } + + ctx.save(); + ctx.translate(plotOffset.left, plotOffset.top); + ctx.lineJoin = "round"; + + var lw = series.lines.lineWidth, + sw = series.shadowSize; + // FIXME: consider another form of shadow when filling is turned on + if (lw > 0 && sw > 0) { + // draw shadow as a thick and thin line with transparency + ctx.lineWidth = sw; + ctx.strokeStyle = "rgba(0,0,0,0.1)"; + // position shadow at angle from the mid of line + var angle = Math.PI/18; + plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/2), Math.cos(angle) * (lw/2 + sw/2), series.xaxis, series.yaxis); + ctx.lineWidth = sw/2; + plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/4), Math.cos(angle) * (lw/2 + sw/4), series.xaxis, series.yaxis); + } + + ctx.lineWidth = lw; + ctx.strokeStyle = series.color; + var fillStyle = getFillStyle(series.lines, series.color, 0, plotHeight); + if (fillStyle) { + ctx.fillStyle = fillStyle; + plotLineArea(series.datapoints, series.xaxis, series.yaxis); + } + + if (lw > 0) + plotLine(series.datapoints, 0, 0, series.xaxis, series.yaxis); + ctx.restore(); + } + + function drawSeriesPoints(series) { + function plotPoints(datapoints, radius, fillStyle, offset, shadow, axisx, axisy, symbol) { + var points = datapoints.points, ps = datapoints.pointsize; + + for (var i = 0; i < points.length; i += ps) { + var x = points[i], y = points[i + 1]; + if (x == null || x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max) + continue; + + ctx.beginPath(); + x = axisx.p2c(x); + y = axisy.p2c(y) + offset; + if (symbol == "circle") + ctx.arc(x, y, radius, 0, shadow ? Math.PI : Math.PI * 2, false); + else + symbol(ctx, x, y, radius, shadow); + ctx.closePath(); + + if (fillStyle) { + ctx.fillStyle = fillStyle; + ctx.fill(); + } + ctx.stroke(); + } + } + + ctx.save(); + ctx.translate(plotOffset.left, plotOffset.top); + + var lw = series.points.lineWidth, + sw = series.shadowSize, + radius = series.points.radius, + symbol = series.points.symbol; + if (lw > 0 && sw > 0) { + // draw shadow in two steps + var w = sw / 2; + ctx.lineWidth = w; + ctx.strokeStyle = "rgba(0,0,0,0.1)"; + plotPoints(series.datapoints, radius, null, w + w/2, true, + series.xaxis, series.yaxis, symbol); + + ctx.strokeStyle = "rgba(0,0,0,0.2)"; + plotPoints(series.datapoints, radius, null, w/2, true, + series.xaxis, series.yaxis, symbol); + } + + ctx.lineWidth = lw; + ctx.strokeStyle = series.color; + plotPoints(series.datapoints, radius, + getFillStyle(series.points, series.color), 0, false, + series.xaxis, series.yaxis, symbol); + ctx.restore(); + } + + function drawBar(x, y, b, barLeft, barRight, offset, fillStyleCallback, axisx, axisy, c, horizontal, lineWidth) { + var left, right, bottom, top, + drawLeft, drawRight, drawTop, drawBottom, + tmp; + + // in horizontal mode, we start the bar from the left + // instead of from the bottom so it appears to be + // horizontal rather than vertical + if (horizontal) { + drawBottom = drawRight = drawTop = true; + drawLeft = false; + left = b; + right = x; + top = y + barLeft; + bottom = y + barRight; + + // account for negative bars + if (right < left) { + tmp = right; + right = left; + left = tmp; + drawLeft = true; + drawRight = false; + } + } + else { + drawLeft = drawRight = drawTop = true; + drawBottom = false; + left = x + barLeft; + right = x + barRight; + bottom = b; + top = y; + + // account for negative bars + if (top < bottom) { + tmp = top; + top = bottom; + bottom = tmp; + drawBottom = true; + drawTop = false; + } + } + + // clip + if (right < axisx.min || left > axisx.max || + top < axisy.min || bottom > axisy.max) + return; + + if (left < axisx.min) { + left = axisx.min; + drawLeft = false; + } + + if (right > axisx.max) { + right = axisx.max; + drawRight = false; + } + + if (bottom < axisy.min) { + bottom = axisy.min; + drawBottom = false; + } + + if (top > axisy.max) { + top = axisy.max; + drawTop = false; + } + + left = axisx.p2c(left); + bottom = axisy.p2c(bottom); + right = axisx.p2c(right); + top = axisy.p2c(top); + + // fill the bar + if (fillStyleCallback) { + c.beginPath(); + c.moveTo(left, bottom); + c.lineTo(left, top); + c.lineTo(right, top); + c.lineTo(right, bottom); + c.fillStyle = fillStyleCallback(bottom, top); + c.fill(); + } + + // draw outline + if (lineWidth > 0 && (drawLeft || drawRight || drawTop || drawBottom)) { + c.beginPath(); + + // FIXME: inline moveTo is buggy with excanvas + c.moveTo(left, bottom + offset); + if (drawLeft) + c.lineTo(left, top + offset); + else + c.moveTo(left, top + offset); + if (drawTop) + c.lineTo(right, top + offset); + else + c.moveTo(right, top + offset); + if (drawRight) + c.lineTo(right, bottom + offset); + else + c.moveTo(right, bottom + offset); + if (drawBottom) + c.lineTo(left, bottom + offset); + else + c.moveTo(left, bottom + offset); + c.stroke(); + } + } + + function drawSeriesBars(series) { + function plotBars(datapoints, barLeft, barRight, offset, fillStyleCallback, axisx, axisy) { + var points = datapoints.points, ps = datapoints.pointsize; + + for (var i = 0; i < points.length; i += ps) { + if (points[i] == null) + continue; + drawBar(points[i], points[i + 1], points[i + 2], barLeft, barRight, offset, fillStyleCallback, axisx, axisy, ctx, series.bars.horizontal, series.bars.lineWidth); + } + } + + ctx.save(); + ctx.translate(plotOffset.left, plotOffset.top); + + // FIXME: figure out a way to add shadows (for instance along the right edge) + ctx.lineWidth = series.bars.lineWidth; + ctx.strokeStyle = series.color; + var barLeft = series.bars.align == "left" ? 0 : -series.bars.barWidth/2; + var fillStyleCallback = series.bars.fill ? function (bottom, top) { return getFillStyle(series.bars, series.color, bottom, top); } : null; + plotBars(series.datapoints, barLeft, barLeft + series.bars.barWidth, 0, fillStyleCallback, series.xaxis, series.yaxis); + ctx.restore(); + } + + function getFillStyle(filloptions, seriesColor, bottom, top) { + var fill = filloptions.fill; + if (!fill) + return null; + + if (filloptions.fillColor) + return getColorOrGradient(filloptions.fillColor, bottom, top, seriesColor); + + var c = $.color.parse(seriesColor); + c.a = typeof fill == "number" ? fill : 0.4; + c.normalize(); + return c.toString(); + } + + function insertLegend() { + placeholder.find(".legend").remove(); + + if (!options.legend.show) + return; + + var fragments = [], rowStarted = false, + lf = options.legend.labelFormatter, s, label; + for (var i = 0; i < series.length; ++i) { + s = series[i]; + label = s.label; + if (!label) + continue; + + if (i % options.legend.noColumns == 0) { + if (rowStarted) + fragments.push(''); + fragments.push(''); + rowStarted = true; + } + + if (lf) + label = lf(label, s); + + fragments.push( + '
' + + '' + label + ''); + } + if (rowStarted) + fragments.push(''); + + if (fragments.length == 0) + return; + + var table = '' + fragments.join("") + '
'; + if (options.legend.container != null) + $(options.legend.container).html(table); + else { + var pos = "", + p = options.legend.position, + m = options.legend.margin; + if (m[0] == null) + m = [m, m]; + if (p.charAt(0) == "n") + pos += 'top:' + (m[1] + plotOffset.top) + 'px;'; + else if (p.charAt(0) == "s") + pos += 'bottom:' + (m[1] + plotOffset.bottom) + 'px;'; + if (p.charAt(1) == "e") + pos += 'right:' + (m[0] + plotOffset.right) + 'px;'; + else if (p.charAt(1) == "w") + pos += 'left:' + (m[0] + plotOffset.left) + 'px;'; + var legend = $('
' + table.replace('style="', 'style="position:absolute;' + pos +';') + '
').appendTo(placeholder); + if (options.legend.backgroundOpacity != 0.0) { + // put in the transparent background + // separately to avoid blended labels and + // label boxes + var c = options.legend.backgroundColor; + if (c == null) { + c = options.grid.backgroundColor; + if (c && typeof c == "string") + c = $.color.parse(c); + else + c = $.color.extract(legend, 'background-color'); + c.a = 1; + c = c.toString(); + } + var div = legend.children(); + $('
').prependTo(legend).css('opacity', options.legend.backgroundOpacity); + } + } + } + + + // interactive features + + var highlights = [], + redrawTimeout = null; + + // returns the data item the mouse is over, or null if none is found + function findNearbyItem(mouseX, mouseY, seriesFilter) { + var maxDistance = options.grid.mouseActiveRadius, + smallestDistance = maxDistance * maxDistance + 1, + item = null, foundPoint = false, i, j; + + for (i = series.length - 1; i >= 0; --i) { + if (!seriesFilter(series[i])) + continue; + + var s = series[i], + axisx = s.xaxis, + axisy = s.yaxis, + points = s.datapoints.points, + ps = s.datapoints.pointsize, + mx = axisx.c2p(mouseX), // precompute some stuff to make the loop faster + my = axisy.c2p(mouseY), + maxx = maxDistance / axisx.scale, + maxy = maxDistance / axisy.scale; + + if (s.lines.show || s.points.show) { + for (j = 0; j < points.length; j += ps) { + var x = points[j], y = points[j + 1]; + if (x == null) + continue; + + // For points and lines, the cursor must be within a + // certain distance to the data point + if (x - mx > maxx || x - mx < -maxx || + y - my > maxy || y - my < -maxy) + continue; + + // We have to calculate distances in pixels, not in + // data units, because the scales of the axes may be different + var dx = Math.abs(axisx.p2c(x) - mouseX), + dy = Math.abs(axisy.p2c(y) - mouseY), + dist = dx * dx + dy * dy; // we save the sqrt + + // use <= to ensure last point takes precedence + // (last generally means on top of) + if (dist < smallestDistance) { + smallestDistance = dist; + item = [i, j / ps]; + } + } + } + + if (s.bars.show && !item) { // no other point can be nearby + var barLeft = s.bars.align == "left" ? 0 : -s.bars.barWidth/2, + barRight = barLeft + s.bars.barWidth; + + for (j = 0; j < points.length; j += ps) { + var x = points[j], y = points[j + 1], b = points[j + 2]; + if (x == null) + continue; + + // for a bar graph, the cursor must be inside the bar + if (series[i].bars.horizontal ? + (mx <= Math.max(b, x) && mx >= Math.min(b, x) && + my >= y + barLeft && my <= y + barRight) : + (mx >= x + barLeft && mx <= x + barRight && + my >= Math.min(b, y) && my <= Math.max(b, y))) + item = [i, j / ps]; + } + } + } + + if (item) { + i = item[0]; + j = item[1]; + ps = series[i].datapoints.pointsize; + + return { datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps), + dataIndex: j, + series: series[i], + seriesIndex: i }; + } + + return null; + } + + function onMouseMove(e) { + if (options.grid.hoverable) + triggerClickHoverEvent("plothover", e, + function (s) { return s["hoverable"] != false; }); + } + + function onMouseLeave(e) { + if (options.grid.hoverable) + triggerClickHoverEvent("plothover", e, + function (s) { return false; }); + } + + function onClick(e) { + triggerClickHoverEvent("plotclick", e, + function (s) { return s["clickable"] != false; }); + } + + // trigger click or hover event (they send the same parameters + // so we share their code) + function triggerClickHoverEvent(eventname, event, seriesFilter) { + var offset = eventHolder.offset(), + canvasX = event.pageX - offset.left - plotOffset.left, + canvasY = event.pageY - offset.top - plotOffset.top, + pos = canvasToAxisCoords({ left: canvasX, top: canvasY }); + + pos.pageX = event.pageX; + pos.pageY = event.pageY; + + var item = findNearbyItem(canvasX, canvasY, seriesFilter); + + if (item) { + // fill in mouse pos for any listeners out there + item.pageX = parseInt(item.series.xaxis.p2c(item.datapoint[0]) + offset.left + plotOffset.left); + item.pageY = parseInt(item.series.yaxis.p2c(item.datapoint[1]) + offset.top + plotOffset.top); + } + + if (options.grid.autoHighlight) { + // clear auto-highlights + for (var i = 0; i < highlights.length; ++i) { + var h = highlights[i]; + if (h.auto == eventname && + !(item && h.series == item.series && + h.point[0] == item.datapoint[0] && + h.point[1] == item.datapoint[1])) + unhighlight(h.series, h.point); + } + + if (item) + highlight(item.series, item.datapoint, eventname); + } + + placeholder.trigger(eventname, [ pos, item ]); + } + + function triggerRedrawOverlay() { + if (!redrawTimeout) + redrawTimeout = setTimeout(drawOverlay, 30); + } + + function drawOverlay() { + redrawTimeout = null; + + // draw highlights + octx.save(); + octx.clearRect(0, 0, canvasWidth, canvasHeight); + octx.translate(plotOffset.left, plotOffset.top); + + var i, hi; + for (i = 0; i < highlights.length; ++i) { + hi = highlights[i]; + + if (hi.series.bars.show) + drawBarHighlight(hi.series, hi.point); + else + drawPointHighlight(hi.series, hi.point); + } + octx.restore(); + + executeHooks(hooks.drawOverlay, [octx]); + } + + function highlight(s, point, auto) { + if (typeof s == "number") + s = series[s]; + + if (typeof point == "number") { + var ps = s.datapoints.pointsize; + point = s.datapoints.points.slice(ps * point, ps * (point + 1)); + } + + var i = indexOfHighlight(s, point); + if (i == -1) { + highlights.push({ series: s, point: point, auto: auto }); + + triggerRedrawOverlay(); + } + else if (!auto) + highlights[i].auto = false; + } + + function unhighlight(s, point) { + if (s == null && point == null) { + highlights = []; + triggerRedrawOverlay(); + } + + if (typeof s == "number") + s = series[s]; + + if (typeof point == "number") + point = s.data[point]; + + var i = indexOfHighlight(s, point); + if (i != -1) { + highlights.splice(i, 1); + + triggerRedrawOverlay(); + } + } + + function indexOfHighlight(s, p) { + for (var i = 0; i < highlights.length; ++i) { + var h = highlights[i]; + if (h.series == s && h.point[0] == p[0] + && h.point[1] == p[1]) + return i; + } + return -1; + } + + function drawPointHighlight(series, point) { + var x = point[0], y = point[1], + axisx = series.xaxis, axisy = series.yaxis; + + if (x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max) + return; + + var pointRadius = series.points.radius + series.points.lineWidth / 2; + octx.lineWidth = pointRadius; + octx.strokeStyle = $.color.parse(series.color).scale('a', 0.5).toString(); + var radius = 1.5 * pointRadius, + x = axisx.p2c(x), + y = axisy.p2c(y); + + octx.beginPath(); + if (series.points.symbol == "circle") + octx.arc(x, y, radius, 0, 2 * Math.PI, false); + else + series.points.symbol(octx, x, y, radius, false); + octx.closePath(); + octx.stroke(); + } + + function drawBarHighlight(series, point) { + octx.lineWidth = series.bars.lineWidth; + octx.strokeStyle = $.color.parse(series.color).scale('a', 0.5).toString(); + var fillStyle = $.color.parse(series.color).scale('a', 0.5).toString(); + var barLeft = series.bars.align == "left" ? 0 : -series.bars.barWidth/2; + drawBar(point[0], point[1], point[2] || 0, barLeft, barLeft + series.bars.barWidth, + 0, function () { return fillStyle; }, series.xaxis, series.yaxis, octx, series.bars.horizontal, series.bars.lineWidth); + } + + function getColorOrGradient(spec, bottom, top, defaultColor) { + if (typeof spec == "string") + return spec; + else { + // assume this is a gradient spec; IE currently only + // supports a simple vertical gradient properly, so that's + // what we support too + var gradient = ctx.createLinearGradient(0, top, 0, bottom); + + for (var i = 0, l = spec.colors.length; i < l; ++i) { + var c = spec.colors[i]; + if (typeof c != "string") { + var co = $.color.parse(defaultColor); + if (c.brightness != null) + co = co.scale('rgb', c.brightness) + if (c.opacity != null) + co.a *= c.opacity; + c = co.toString(); + } + gradient.addColorStop(i / (l - 1), c); + } + + return gradient; + } + } + } + + $.plot = function(placeholder, data, options) { + //var t0 = new Date(); + var plot = new Plot($(placeholder), data, options, $.plot.plugins); + //(window.console ? console.log : alert)("time used (msecs): " + ((new Date()).getTime() - t0.getTime())); + return plot; + }; + + $.plot.plugins = []; + + // returns a string with the date d formatted according to fmt + $.plot.formatDate = function(d, fmt, monthNames) { + var leftPad = function(n) { + n = "" + n; + return n.length == 1 ? "0" + n : n; + }; + + var r = []; + var escape = false, padNext = false; + var hours = d.getUTCHours(); + var isAM = hours < 12; + if (monthNames == null) + monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; + + if (fmt.search(/%p|%P/) != -1) { + if (hours > 12) { + hours = hours - 12; + } else if (hours == 0) { + hours = 12; + } + } + for (var i = 0; i < fmt.length; ++i) { + var c = fmt.charAt(i); + + if (escape) { + switch (c) { + case 'h': c = "" + hours; break; + case 'H': c = leftPad(hours); break; + case 'M': c = leftPad(d.getUTCMinutes()); break; + case 'S': c = leftPad(d.getUTCSeconds()); break; + case 'd': c = "" + d.getUTCDate(); break; + case 'm': c = "" + (d.getUTCMonth() + 1); break; + case 'y': c = "" + d.getUTCFullYear(); break; + case 'b': c = "" + monthNames[d.getUTCMonth()]; break; + case 'p': c = (isAM) ? ("" + "am") : ("" + "pm"); break; + case 'P': c = (isAM) ? ("" + "AM") : ("" + "PM"); break; + case '0': c = ""; padNext = true; break; + } + if (c && padNext) { + c = leftPad(c); + padNext = false; + } + r.push(c); + if (!padNext) + escape = false; + } + else { + if (c == "%") + escape = true; + else + r.push(c); + } + } + return r.join(""); + }; + + // round to nearby lower multiple of base + function floorInBase(n, base) { + return base * Math.floor(n / base); + } + +})(jQuery); diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js b/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js new file mode 100644 index 00000000..fe56e589 --- /dev/null +++ b/productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js @@ -0,0 +1,462 @@ +(function($){$.color={};$.color.make=function(E,D,B,C){var F={};F.r=E||0;F.g=D||0;F.b=B||0;F.a=C!=null?C:1;F.add=function(I,H){for(var G=0;G=1){return"rgb("+[F.r,F.g,F.b].join(",")+")"}else{return"rgba("+[F.r,F.g,F.b,F.a].join(",")+")"}};F.normalize=function(){function G(I,J,H){return JH?H:J)}F.r=G(0,parseInt(F.r),255);F.g=G(0,parseInt(F.g),255);F.b=G(0,parseInt(F.b),255);F.a=G(0,F.a,1);return F};F.clone=function(){return $.color.make(F.r,F.b,F.g,F.a)};return F.normalize()};$.color.extract=function(C,B){var D;do{D=C.css(B).toLowerCase();if(D!=""&&D!="transparent"){break}C=C.parent()}while(!$.nodeName(C.get(0),"body"));if(D=="rgba(0, 0, 0, 0)"){D="transparent"}return $.color.parse(D)};$.color.parse=function(E){var D,B=$.color.make;if(D=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10))}if(D=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10),parseFloat(D[4]))}if(D=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55)}if(D=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55,parseFloat(D[4]))}if(D=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(E)){return B(parseInt(D[1],16),parseInt(D[2],16),parseInt(D[3],16))}if(D=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(E)){return B(parseInt(D[1]+D[1],16),parseInt(D[2]+D[2],16),parseInt(D[3]+D[3],16))}var C=$.trim(E).toLowerCase();if(C=="transparent"){return B(255,255,255,0)}else{D=A[C];return B(D[0],D[1],D[2])}};var A={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);(function($){function Plot(placeholder,data_,options_,plugins){var series=[],options={colors:["#edc240","#afd8f8","#cb4b4b","#4da74d","#9440ed"],legend:{show:true,noColumns:1,labelFormatter:null,labelBoxBorderColor:"#ccc",container:null,position:"ne",margin:5,backgroundColor:null,backgroundOpacity:0.85},xaxis:{position:"bottom",mode:null,color:null,tickColor:null,transform:null,inverseTransform:null,min:null,max:null,autoscaleMargin:null,ticks:null,tickFormatter:null,labelWidth:null,labelHeight:null,tickLength:null,alignTicksWithAxis:null,tickDecimals:null,tickSize:null,minTickSize:null,monthNames:null,timeformat:null,twelveHourClock:false},yaxis:{autoscaleMargin:0.02,position:"left"},xaxes:[],yaxes:[],series:{points:{show:false,radius:3,lineWidth:2,fill:true,fillColor:"#ffffff",symbol:"circle"},lines:{lineWidth:2,fill:false,fillColor:null,steps:false},bars:{show:false,lineWidth:2,barWidth:1,fill:true,fillColor:null,align:"left",horizontal:false},shadowSize:3},grid:{show:true,aboveData:false,color:"#545454",backgroundColor:null,borderColor:null,tickColor:null,labelMargin:5,axisMargin:8,borderWidth:2,markings:null,markingsColor:"#f4f4f4",markingsLineWidth:2,clickable:false,hoverable:false,autoHighlight:true,mouseActiveRadius:10},hooks:{}},canvas=null,overlay=null,eventHolder=null,ctx=null,octx=null,xaxes=[],yaxes=[],plotOffset={left:0,right:0,top:0,bottom:0},canvasWidth=0,canvasHeight=0,plotWidth=0,plotHeight=0,hooks={processOptions:[],processRawData:[],processDatapoints:[],drawSeries:[],draw:[],bindEvents:[],drawOverlay:[]},plot=this;plot.setData=setData;plot.setupGrid=setupGrid;plot.draw=draw;plot.getPlaceholder=function(){return placeholder;};plot.getCanvas=function(){return canvas;};plot.getPlotOffset=function(){return plotOffset;};plot.width=function(){return plotWidth;};plot.height=function(){return plotHeight;};plot.offset=function(){var o=eventHolder.offset();o.left+=plotOffset.left;o.top+=plotOffset.top;return o;};plot.getData=function(){return series;};plot.getAxis=function(dir,number){var a=(dir=="x"?xaxes:yaxes)[number-1];if(a&&!a.used) +a=null;return a;};plot.getAxes=function(){var res={},i;for(i=0;i=options.colors.length){i=0;++variation;}} +var colori=0,s;for(i=0;iaxis.datamax) +axis.datamax=max;} +for(i=0;i0&&points[k-ps]!=null&&points[k-ps]!=points[k]&&points[k-ps+1]!=points[k+1]){for(m=0;mxmax) +xmax=val;} +if(f.y){if(valymax) +ymax=val;}}} +if(s.bars.show){var delta=s.bars.align=="left"?0:-s.bars.barWidth/2;if(s.bars.horizontal){ymin+=delta;ymax+=delta+s.bars.barWidth;} +else{xmin+=delta;xmax+=delta+s.bars.barWidth;}} +updateAxis(s.xaxis,xmin,xmax);updateAxis(s.yaxis,ymin,ymax);} +$.each(getUsedAxes(),function(i,axis){if(axis.datamin==topSentry) +axis.datamin=null;if(axis.datamax==bottomSentry) +axis.datamax=null;});} +function constructCanvas(){canvasWidth=placeholder.width();canvasHeight=placeholder.height();if(window.G_vmlCanvasManager) +placeholder.find("canvas").each(function(){this.context_=null;});placeholder.html("");if(placeholder.css("position")=='static') +placeholder.css("position","relative");if(canvasWidth<=0||canvasHeight<=0) +throw"Invalid dimensions for plot, width = "+canvasWidth+", height = "+canvasHeight;function makeCanvas(skipPositioning){var c=document.createElement('canvas');c.width=canvasWidth;c.height=canvasHeight;if(!skipPositioning) +$(c).css({position:'absolute',left:0,top:0});$(c).appendTo(placeholder);if(!c.getContext) +c=window.G_vmlCanvasManager.initElement(c);return c;} +canvas=makeCanvas(true);ctx=canvas.getContext("2d");overlay=makeCanvas();octx=overlay.getContext("2d");} +function bindEvents(){eventHolder=$([overlay,canvas]);if(options.grid.hoverable){eventHolder.mousemove(onMouseMove);eventHolder.mouseleave(onMouseLeave);} +if(options.grid.clickable) +eventHolder.click(onClick);executeHooks(hooks.bindEvents,[eventHolder]);} +function setTransformationHelpers(axis){function identity(x){return x;} +var s,m,t=axis.options.transform||identity,it=axis.options.inverseTransform;if(axis.direction=="x"){s=axis.scale=plotWidth/(t(axis.max)-t(axis.min));m=t(axis.min);if(t==identity) +axis.p2c=function(p){return(p-m)*s;};else +axis.p2c=function(p){return(t(p)-m)*s;};if(!it) +axis.c2p=function(c){return m+c/s;};else +axis.c2p=function(c){return it(m+c/s);};} +else{s=axis.scale=plotHeight/(t(axis.max)-t(axis.min));m=t(axis.max);if(t==identity) +axis.p2c=function(p){return(m-p)*s;};else +axis.p2c=function(p){return(m-t(p))*s;};if(!it) +axis.c2p=function(c){return m-c/s;};else +axis.c2p=function(c){return it(m-c/s);};}} +function measureTickLabels(axis){if(!axis) +return;var opts=axis.options,i,ticks=axis.ticks||[],labels=[],l,w=opts.labelWidth,h=opts.labelHeight,dummyDiv;function makeDummyDiv(labels,width){return $('
'+'
' ++labels.join("")+'
').appendTo(placeholder);} +if(axis.direction=="x"){if(w==null) +w=Math.floor(canvasWidth/(ticks.length>0?ticks.length:1));if(h==null){labels=[];for(i=0;i'+l+'');} +if(labels.length>0){labels.push('
');dummyDiv=makeDummyDiv(labels,"width:10000px;");h=dummyDiv.height();dummyDiv.remove();}}} +else if(w==null||h==null){for(i=0;i'+l+'');} +if(labels.length>0){dummyDiv=makeDummyDiv(labels,"");if(w==null) +w=dummyDiv.children().width();if(h==null) +h=dummyDiv.find("div.tickLabel").height();dummyDiv.remove();}} +if(w==null) +w=0;if(h==null) +h=0;axis.labelWidth=w;axis.labelHeight=h;} +function computeAxisBox(axis){if(!axis||!axis.labelWidth||!axis.labelHeight) +return;var lw=axis.labelWidth,lh=axis.labelHeight,pos=axis.options.position,tickLength=axis.options.tickLength,axismargin=options.grid.axisMargin,padding=options.grid.labelMargin,all=axis.direction=="x"?xaxes:yaxes,index;var samePosition=$.grep(all,function(a){return a&&a.options.position==pos&&(a.labelHeight||a.labelWidth);});if($.inArray(axis,samePosition)==samePosition.length-1) +axismargin=0;if(tickLength==null) +tickLength="full";var sameDirection=$.grep(all,function(a){return a&&(a.labelHeight||a.labelWidth);});var innermost=$.inArray(axis,sameDirection)==0;if(!innermost&&tickLength=="full") +tickLength=5;if(!isNaN(+tickLength)) +padding+=+tickLength;if(axis.direction=="x"){lh+=padding;if(pos=="bottom"){plotOffset.bottom+=lh+axismargin;axis.box={top:canvasHeight-plotOffset.bottom,height:lh};} +else{axis.box={top:plotOffset.top+axismargin,height:lh};plotOffset.top+=lh+axismargin;}} +else{lw+=padding;if(pos=="left"){axis.box={left:plotOffset.left+axismargin,width:lw};plotOffset.left+=lw+axismargin;} +else{plotOffset.right+=lw+axismargin;axis.box={left:canvasWidth-plotOffset.right,width:lw};}} +axis.position=pos;axis.tickLength=tickLength;axis.box.padding=padding;axis.innermost=innermost;} +function fixupAxisBox(axis){if(!axis||!axis.labelWidth||!axis.labelHeight) +return;if(axis.direction=="x"){axis.box.left=plotOffset.left;axis.box.width=plotWidth;} +else{axis.box.top=plotOffset.top;axis.box.height=plotHeight;}} +function setupGrid(){var axes=getUsedAxes(),j,k;for(k=0;k=0;--j) +computeAxisBox(xaxes[j]);for(j=yaxes.length-1;j>=0;--j) +computeAxisBox(yaxes[j]);var maxOutset=0;for(var i=0;i=0) +min=0;} +if(opts.max==null){max+=delta*margin;if(max>0&&axis.datamax!=null&&axis.datamax<=0) +max=0;}}} +axis.min=min;axis.max=max;} +function setupTickGeneration(axis){var opts=axis.options;var noTicks;if(typeof opts.ticks=="number"&&opts.ticks>0) +noTicks=opts.ticks;else if(axis.direction=="x") +noTicks=0.3*Math.sqrt(canvasWidth);else +noTicks=0.3*Math.sqrt(canvasHeight);var delta=(axis.max-axis.min)/noTicks,size,generator,unit,formatter,i,magn,norm;if(opts.mode=="time"){var timeUnitSize={"second":1000,"minute":60*1000,"hour":60*60*1000,"day":24*60*60*1000,"month":30*24*60*60*1000,"year":365.2425*24*60*60*1000};var spec=[[1,"second"],[2,"second"],[5,"second"],[10,"second"],[30,"second"],[1,"minute"],[2,"minute"],[5,"minute"],[10,"minute"],[30,"minute"],[1,"hour"],[2,"hour"],[4,"hour"],[8,"hour"],[12,"hour"],[1,"day"],[2,"day"],[3,"day"],[0.25,"month"],[0.5,"month"],[1,"month"],[2,"month"],[3,"month"],[6,"month"],[1,"year"]];var minSize=0;if(opts.minTickSize!=null){if(typeof opts.tickSize=="number") +minSize=opts.tickSize;else +minSize=opts.minTickSize[0]*timeUnitSize[opts.minTickSize[1]];} +for(var i=0;i=minSize) +break;size=spec[i][0];unit=spec[i][1];if(unit=="year"){magn=Math.pow(10,Math.floor(Math.log(delta/timeUnitSize.year)/Math.LN10));norm=(delta/timeUnitSize.year)/magn;if(norm<1.5) +size=1;else if(norm<3) +size=2;else if(norm<7.5) +size=5;else +size=10;size*=magn;} +axis.tickSize=opts.tickSize||[size,unit];generator=function(axis){var ticks=[],tickSize=axis.tickSize[0],unit=axis.tickSize[1],d=new Date(axis.min);var step=tickSize*timeUnitSize[unit];if(unit=="second") +d.setUTCSeconds(floorInBase(d.getUTCSeconds(),tickSize));if(unit=="minute") +d.setUTCMinutes(floorInBase(d.getUTCMinutes(),tickSize));if(unit=="hour") +d.setUTCHours(floorInBase(d.getUTCHours(),tickSize));if(unit=="month") +d.setUTCMonth(floorInBase(d.getUTCMonth(),tickSize));if(unit=="year") +d.setUTCFullYear(floorInBase(d.getUTCFullYear(),tickSize));d.setUTCMilliseconds(0);if(step>=timeUnitSize.minute) +d.setUTCSeconds(0);if(step>=timeUnitSize.hour) +d.setUTCMinutes(0);if(step>=timeUnitSize.day) +d.setUTCHours(0);if(step>=timeUnitSize.day*4) +d.setUTCDate(1);if(step>=timeUnitSize.year) +d.setUTCMonth(0);var carry=0,v=Number.NaN,prev;do{prev=v;v=d.getTime();ticks.push(v);if(unit=="month"){if(tickSize<1){d.setUTCDate(1);var start=d.getTime();d.setUTCMonth(d.getUTCMonth()+1);var end=d.getTime();d.setTime(v+carry*timeUnitSize.hour+(end-start)*tickSize);carry=d.getUTCHours();d.setUTCHours(0);} +else +d.setUTCMonth(d.getUTCMonth()+tickSize);} +else if(unit=="year"){d.setUTCFullYear(d.getUTCFullYear()+tickSize);} +else +d.setTime(v+step);}while(vmaxDec) +dec=maxDec;magn=Math.pow(10,-dec);norm=delta/magn;if(norm<1.5) +size=1;else if(norm<3){size=2;if(norm>2.25&&(maxDec==null||dec+1<=maxDec)){size=2.5;++dec;}} +else if(norm<7.5) +size=5;else +size=10;size*=magn;if(opts.minTickSize!=null&&size0){if(opts.min==null) +axis.min=Math.min(axis.min,niceTicks[0]);if(opts.max==null&&niceTicks.length>1) +axis.max=Math.max(axis.max,niceTicks[niceTicks.length-1]);} +generator=function(axis){var ticks=[],v,i;for(i=0;i1&&/\..*0$/.test((ts[1]-ts[0]).toFixed(extraDec)))) +axis.tickDecimals=extraDec;}}} +axis.tickGenerator=generator;if($.isFunction(opts.tickFormatter)) +axis.tickFormatter=function(v,axis){return""+opts.tickFormatter(v,axis);};else +axis.tickFormatter=formatter;} +function setTicks(axis){axis.ticks=[];var oticks=axis.options.ticks,ticks=[];if(oticks==null||(typeof oticks=="number"&&oticks>0)) +ticks=axis.tickGenerator(axis);else if(oticks){if($.isFunction(oticks)) +ticks=oticks({min:axis.min,max:axis.max});else +ticks=oticks;} +var i,v;for(i=0;i1) +label=t[1];} +else +v=t;if(label==null) +label=axis.tickFormatter(v,axis);axis.ticks[i]={v:v,label:label};}} +function snapRangeToTicks(axis,ticks){if(axis.options.autoscaleMargin&&ticks.length>0){if(axis.options.min==null) +axis.min=Math.min(axis.min,ticks[0].v);if(axis.options.max==null&&ticks.length>1) +axis.max=Math.max(axis.max,ticks[ticks.length-1].v);}} +function draw(){ctx.clearRect(0,0,canvasWidth,canvasHeight);var grid=options.grid;if(grid.show&&grid.backgroundColor) +drawBackground();if(grid.show&&!grid.aboveData) +drawGrid();for(var i=0;ito){var tmp=from;from=to;to=tmp;} +return{from:from,to:to,axis:axis};} +function drawBackground(){ctx.save();ctx.translate(plotOffset.left,plotOffset.top);ctx.fillStyle=getColorOrGradient(options.grid.backgroundColor,plotHeight,0,"rgba(255, 255, 255, 0)");ctx.fillRect(0,0,plotWidth,plotHeight);ctx.restore();} +function drawGrid(){var i;ctx.save();ctx.translate(plotOffset.left,plotOffset.top);var markings=options.grid.markings;if(markings){if($.isFunction(markings)){var axes=plot.getAxes();axes.xmin=axes.xaxis.min;axes.xmax=axes.xaxis.max;axes.ymin=axes.yaxis.min;axes.ymax=axes.yaxis.max;markings=markings(axes);} +for(i=0;ixrange.axis.max||yrange.toyrange.axis.max) +continue;xrange.from=Math.max(xrange.from,xrange.axis.min);xrange.to=Math.min(xrange.to,xrange.axis.max);yrange.from=Math.max(yrange.from,yrange.axis.min);yrange.to=Math.min(yrange.to,yrange.axis.max);if(xrange.from==xrange.to&&yrange.from==yrange.to) +continue;xrange.from=xrange.axis.p2c(xrange.from);xrange.to=xrange.axis.p2c(xrange.to);yrange.from=yrange.axis.p2c(yrange.from);yrange.to=yrange.axis.p2c(yrange.to);if(xrange.from==xrange.to||yrange.from==yrange.to){ctx.beginPath();ctx.strokeStyle=m.color||options.grid.markingsColor;ctx.lineWidth=m.lineWidth||options.grid.markingsLineWidth;ctx.moveTo(xrange.from,yrange.from);ctx.lineTo(xrange.to,yrange.to);ctx.stroke();} +else{ctx.fillStyle=m.color||options.grid.markingsColor;ctx.fillRect(xrange.from,yrange.to,xrange.to-xrange.from,yrange.from-yrange.to);}}} +var axes=getUsedAxes(),bw=options.grid.borderWidth;for(var j=0;jaxis.max||(t=="full"&&bw>0&&(v==axis.min||v==axis.max))) +continue;if(axis.direction=="x"){x=axis.p2c(v);yoff=t=="full"?-plotHeight:t;if(axis.position=="top") +yoff=-yoff;} +else{y=axis.p2c(v);xoff=t=="full"?-plotWidth:t;if(axis.position=="left") +xoff=-xoff;} +if(ctx.lineWidth==1){if(axis.direction=="x") +x=Math.floor(x)+0.5;else +y=Math.floor(y)+0.5;} +ctx.moveTo(x,y);ctx.lineTo(x+xoff,y+yoff);} +ctx.stroke();} +if(bw){ctx.lineWidth=bw;ctx.strokeStyle=options.grid.borderColor;ctx.strokeRect(-bw/2,-bw/2,plotWidth+bw,plotHeight+bw);} +ctx.restore();} +function insertAxisLabels(){placeholder.find(".tickLabels").remove();var html=['
'];var axes=getUsedAxes();for(var j=0;j');for(var i=0;iaxis.max) +continue;var pos={},align;if(axis.direction=="x"){align="center";pos.left=Math.round(plotOffset.left+axis.p2c(tick.v)-axis.labelWidth/2);if(axis.position=="bottom") +pos.top=box.top+box.padding;else +pos.bottom=canvasHeight-(box.top+box.height-box.padding);} +else{pos.top=Math.round(plotOffset.top+axis.p2c(tick.v)-axis.labelHeight/2);if(axis.position=="left"){pos.right=canvasWidth-(box.left+box.width-box.padding) +align="right";} +else{pos.left=box.left+box.padding;align="left";}} +pos.width=axis.labelWidth;var style=["position:absolute","text-align:"+align];for(var a in pos) +style.push(a+":"+pos[a]+"px") +html.push('
'+tick.label+'
');} +html.push('
');} +html.push('');placeholder.append(html.join(""));} +function drawSeries(series){if(series.lines.show) +drawSeriesLines(series);if(series.bars.show) +drawSeriesBars(series);if(series.points.show) +drawSeriesPoints(series);} +function drawSeriesLines(series){function plotLine(datapoints,xoffset,yoffset,axisx,axisy){var points=datapoints.points,ps=datapoints.pointsize,prevx=null,prevy=null;ctx.beginPath();for(var i=ps;i=y2&&y1>axisy.max){if(y2>axisy.max) +continue;x1=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y1=axisy.max;} +else if(y2>=y1&&y2>axisy.max){if(y1>axisy.max) +continue;x2=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y2=axisy.max;} +if(x1<=x2&&x1=x2&&x1>axisx.max){if(x2>axisx.max) +continue;y1=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x1=axisx.max;} +else if(x2>=x1&&x2>axisx.max){if(x1>axisx.max) +continue;y2=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x2=axisx.max;} +if(x1!=prevx||y1!=prevy) +ctx.moveTo(axisx.p2c(x1)+xoffset,axisy.p2c(y1)+yoffset);prevx=x2;prevy=y2;ctx.lineTo(axisx.p2c(x2)+xoffset,axisy.p2c(y2)+yoffset);} +ctx.stroke();} +function plotLineArea(datapoints,axisx,axisy){var points=datapoints.points,ps=datapoints.pointsize,bottom=Math.min(Math.max(0,axisy.min),axisy.max),i=0,top,areaOpen=false,ypos=1,segmentStart=0,segmentEnd=0;while(true){if(ps>0&&i>points.length+ps) +break;i+=ps;var x1=points[i-ps],y1=points[i-ps+ypos],x2=points[i],y2=points[i+ypos];if(areaOpen){if(ps>0&&x1!=null&&x2==null){segmentEnd=i;ps=-ps;ypos=2;continue;} +if(ps<0&&i==segmentStart+ps){ctx.fill();areaOpen=false;ps=-ps;ypos=1;i=segmentStart=segmentEnd+ps;continue;}} +if(x1==null||x2==null) +continue;if(x1<=x2&&x1=x2&&x1>axisx.max){if(x2>axisx.max) +continue;y1=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x1=axisx.max;} +else if(x2>=x1&&x2>axisx.max){if(x1>axisx.max) +continue;y2=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x2=axisx.max;} +if(!areaOpen){ctx.beginPath();ctx.moveTo(axisx.p2c(x1),axisy.p2c(bottom));areaOpen=true;} +if(y1>=axisy.max&&y2>=axisy.max){ctx.lineTo(axisx.p2c(x1),axisy.p2c(axisy.max));ctx.lineTo(axisx.p2c(x2),axisy.p2c(axisy.max));continue;} +else if(y1<=axisy.min&&y2<=axisy.min){ctx.lineTo(axisx.p2c(x1),axisy.p2c(axisy.min));ctx.lineTo(axisx.p2c(x2),axisy.p2c(axisy.min));continue;} +var x1old=x1,x2old=x2;if(y1<=y2&&y1=axisy.min){x1=(axisy.min-y1)/(y2-y1)*(x2-x1)+x1;y1=axisy.min;} +else if(y2<=y1&&y2=axisy.min){x2=(axisy.min-y1)/(y2-y1)*(x2-x1)+x1;y2=axisy.min;} +if(y1>=y2&&y1>axisy.max&&y2<=axisy.max){x1=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y1=axisy.max;} +else if(y2>=y1&&y2>axisy.max&&y1<=axisy.max){x2=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y2=axisy.max;} +if(x1!=x1old){ctx.lineTo(axisx.p2c(x1old),axisy.p2c(y1));} +ctx.lineTo(axisx.p2c(x1),axisy.p2c(y1));ctx.lineTo(axisx.p2c(x2),axisy.p2c(y2));if(x2!=x2old){ctx.lineTo(axisx.p2c(x2),axisy.p2c(y2));ctx.lineTo(axisx.p2c(x2old),axisy.p2c(y2));}}} +ctx.save();ctx.translate(plotOffset.left,plotOffset.top);ctx.lineJoin="round";var lw=series.lines.lineWidth,sw=series.shadowSize;if(lw>0&&sw>0){ctx.lineWidth=sw;ctx.strokeStyle="rgba(0,0,0,0.1)";var angle=Math.PI/18;plotLine(series.datapoints,Math.sin(angle)*(lw/2+sw/2),Math.cos(angle)*(lw/2+sw/2),series.xaxis,series.yaxis);ctx.lineWidth=sw/2;plotLine(series.datapoints,Math.sin(angle)*(lw/2+sw/4),Math.cos(angle)*(lw/2+sw/4),series.xaxis,series.yaxis);} +ctx.lineWidth=lw;ctx.strokeStyle=series.color;var fillStyle=getFillStyle(series.lines,series.color,0,plotHeight);if(fillStyle){ctx.fillStyle=fillStyle;plotLineArea(series.datapoints,series.xaxis,series.yaxis);} +if(lw>0) +plotLine(series.datapoints,0,0,series.xaxis,series.yaxis);ctx.restore();} +function drawSeriesPoints(series){function plotPoints(datapoints,radius,fillStyle,offset,shadow,axisx,axisy,symbol){var points=datapoints.points,ps=datapoints.pointsize;for(var i=0;iaxisx.max||yaxisy.max) +continue;ctx.beginPath();x=axisx.p2c(x);y=axisy.p2c(y)+offset;if(symbol=="circle") +ctx.arc(x,y,radius,0,shadow?Math.PI:Math.PI*2,false);else +symbol(ctx,x,y,radius,shadow);ctx.closePath();if(fillStyle){ctx.fillStyle=fillStyle;ctx.fill();} +ctx.stroke();}} +ctx.save();ctx.translate(plotOffset.left,plotOffset.top);var lw=series.points.lineWidth,sw=series.shadowSize,radius=series.points.radius,symbol=series.points.symbol;if(lw>0&&sw>0){var w=sw/2;ctx.lineWidth=w;ctx.strokeStyle="rgba(0,0,0,0.1)";plotPoints(series.datapoints,radius,null,w+w/2,true,series.xaxis,series.yaxis,symbol);ctx.strokeStyle="rgba(0,0,0,0.2)";plotPoints(series.datapoints,radius,null,w/2,true,series.xaxis,series.yaxis,symbol);} +ctx.lineWidth=lw;ctx.strokeStyle=series.color;plotPoints(series.datapoints,radius,getFillStyle(series.points,series.color),0,false,series.xaxis,series.yaxis,symbol);ctx.restore();} +function drawBar(x,y,b,barLeft,barRight,offset,fillStyleCallback,axisx,axisy,c,horizontal,lineWidth){var left,right,bottom,top,drawLeft,drawRight,drawTop,drawBottom,tmp;if(horizontal){drawBottom=drawRight=drawTop=true;drawLeft=false;left=b;right=x;top=y+barLeft;bottom=y+barRight;if(rightaxisx.max||topaxisy.max) +return;if(leftaxisx.max){right=axisx.max;drawRight=false;} +if(bottomaxisy.max){top=axisy.max;drawTop=false;} +left=axisx.p2c(left);bottom=axisy.p2c(bottom);right=axisx.p2c(right);top=axisy.p2c(top);if(fillStyleCallback){c.beginPath();c.moveTo(left,bottom);c.lineTo(left,top);c.lineTo(right,top);c.lineTo(right,bottom);c.fillStyle=fillStyleCallback(bottom,top);c.fill();} +if(lineWidth>0&&(drawLeft||drawRight||drawTop||drawBottom)){c.beginPath();c.moveTo(left,bottom+offset);if(drawLeft) +c.lineTo(left,top+offset);else +c.moveTo(left,top+offset);if(drawTop) +c.lineTo(right,top+offset);else +c.moveTo(right,top+offset);if(drawRight) +c.lineTo(right,bottom+offset);else +c.moveTo(right,bottom+offset);if(drawBottom) +c.lineTo(left,bottom+offset);else +c.moveTo(left,bottom+offset);c.stroke();}} +function drawSeriesBars(series){function plotBars(datapoints,barLeft,barRight,offset,fillStyleCallback,axisx,axisy){var points=datapoints.points,ps=datapoints.pointsize;for(var i=0;i');fragments.push('');rowStarted=true;} +if(lf) +label=lf(label,s);fragments.push('
'+''+label+'');} +if(rowStarted) +fragments.push('');if(fragments.length==0) +return;var table=''+fragments.join("")+'
';if(options.legend.container!=null) +$(options.legend.container).html(table);else{var pos="",p=options.legend.position,m=options.legend.margin;if(m[0]==null) +m=[m,m];if(p.charAt(0)=="n") +pos+='top:'+(m[1]+plotOffset.top)+'px;';else if(p.charAt(0)=="s") +pos+='bottom:'+(m[1]+plotOffset.bottom)+'px;';if(p.charAt(1)=="e") +pos+='right:'+(m[0]+plotOffset.right)+'px;';else if(p.charAt(1)=="w") +pos+='left:'+(m[0]+plotOffset.left)+'px;';var legend=$('
'+table.replace('style="','style="position:absolute;'+pos+';')+'
').appendTo(placeholder);if(options.legend.backgroundOpacity!=0.0){var c=options.legend.backgroundColor;if(c==null){c=options.grid.backgroundColor;if(c&&typeof c=="string") +c=$.color.parse(c);else +c=$.color.extract(legend,'background-color');c.a=1;c=c.toString();} +var div=legend.children();$('
').prependTo(legend).css('opacity',options.legend.backgroundOpacity);}}} +var highlights=[],redrawTimeout=null;function findNearbyItem(mouseX,mouseY,seriesFilter){var maxDistance=options.grid.mouseActiveRadius,smallestDistance=maxDistance*maxDistance+1,item=null,foundPoint=false,i,j;for(i=series.length-1;i>=0;--i){if(!seriesFilter(series[i])) +continue;var s=series[i],axisx=s.xaxis,axisy=s.yaxis,points=s.datapoints.points,ps=s.datapoints.pointsize,mx=axisx.c2p(mouseX),my=axisy.c2p(mouseY),maxx=maxDistance/axisx.scale,maxy=maxDistance/axisy.scale;if(s.lines.show||s.points.show){for(j=0;jmaxx||x-mx<-maxx||y-my>maxy||y-my<-maxy) +continue;var dx=Math.abs(axisx.p2c(x)-mouseX),dy=Math.abs(axisy.p2c(y)-mouseY),dist=dx*dx+dy*dy;if(dist=Math.min(b,x)&&my>=y+barLeft&&my<=y+barRight):(mx>=x+barLeft&&mx<=x+barRight&&my>=Math.min(b,y)&&my<=Math.max(b,y))) +item=[i,j/ps];}}} +if(item){i=item[0];j=item[1];ps=series[i].datapoints.pointsize;return{datapoint:series[i].datapoints.points.slice(j*ps,(j+1)*ps),dataIndex:j,series:series[i],seriesIndex:i};} +return null;} +function onMouseMove(e){if(options.grid.hoverable) +triggerClickHoverEvent("plothover",e,function(s){return s["hoverable"]!=false;});} +function onMouseLeave(e){if(options.grid.hoverable) +triggerClickHoverEvent("plothover",e,function(s){return false;});} +function onClick(e){triggerClickHoverEvent("plotclick",e,function(s){return s["clickable"]!=false;});} +function triggerClickHoverEvent(eventname,event,seriesFilter){var offset=eventHolder.offset(),canvasX=event.pageX-offset.left-plotOffset.left,canvasY=event.pageY-offset.top-plotOffset.top,pos=canvasToAxisCoords({left:canvasX,top:canvasY});pos.pageX=event.pageX;pos.pageY=event.pageY;var item=findNearbyItem(canvasX,canvasY,seriesFilter);if(item){item.pageX=parseInt(item.series.xaxis.p2c(item.datapoint[0])+offset.left+plotOffset.left);item.pageY=parseInt(item.series.yaxis.p2c(item.datapoint[1])+offset.top+plotOffset.top);} +if(options.grid.autoHighlight){for(var i=0;iaxisx.max||yaxisy.max) +return;var pointRadius=series.points.radius+series.points.lineWidth/2;octx.lineWidth=pointRadius;octx.strokeStyle=$.color.parse(series.color).scale('a',0.5).toString();var radius=1.5*pointRadius,x=axisx.p2c(x),y=axisy.p2c(y);octx.beginPath();if(series.points.symbol=="circle") +octx.arc(x,y,radius,0,2*Math.PI,false);else +series.points.symbol(octx,x,y,radius,false);octx.closePath();octx.stroke();} +function drawBarHighlight(series,point){octx.lineWidth=series.bars.lineWidth;octx.strokeStyle=$.color.parse(series.color).scale('a',0.5).toString();var fillStyle=$.color.parse(series.color).scale('a',0.5).toString();var barLeft=series.bars.align=="left"?0:-series.bars.barWidth/2;drawBar(point[0],point[1],point[2]||0,barLeft,barLeft+series.bars.barWidth,0,function(){return fillStyle;},series.xaxis,series.yaxis,octx,series.bars.horizontal,series.bars.lineWidth);} +function getColorOrGradient(spec,bottom,top,defaultColor){if(typeof spec=="string") +return spec;else{var gradient=ctx.createLinearGradient(0,top,0,bottom);for(var i=0,l=spec.colors.length;i12){hours=hours-12;}else if(hours==0){hours=12;}} +for(var i=0;i -<#assign excanvas = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.js'> -<#assign flot = 'js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js'> +<#-- Currently we are using the developer build version for both flot & excanvas libraries, +this is because IE 9 complains about certain properties. After testing it seems that dev +build version is stable enough. If in next couple of days we feel that there are some issues +we will default to using the stable version unless the request comes from IE 9 in which case +we will use rev 293 (dev build version) of the flot & excanvas files. +--> +<#assign excanvas = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js'> +<#assign flot = 'js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js'> + + <#assign fliptext = 'js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js'> <#assign jqueryNotify = 'js/jquery_plugins/jquery.notify.min.js'> <#assign jqueryUI = 'js/jquery-ui/js/jquery-ui-1.8.4.custom.min.js'> @@ -64,6 +72,7 @@ ${scripts.add(jqueryNotify)} <#assign jqueryNotifyStyle = "css/jquery_plugins/ui.notify.css" /> <#assign entityComparisonStyle = "css/visualization/entitycomparison/layout.css" /> <#assign entityComparisonStyleIEHack = "${urls.base}/css/visualization/entitycomparison/layout-ie.css" /> +<#assign entityComparisonStyleIE_6_7_Hack = "${urls.base}/css/visualization/entitycomparison/layout-ie-67.css" /> <#assign vizStyle = "css/visualization/visualization.css" /> ${stylesheets.add(jqueryUIStyle)} @@ -72,6 +81,7 @@ ${stylesheets.add(entityComparisonStyle)} ${stylesheets.add(vizStyle)} ${stylesheets.add(jqueryNotifyStyle)} + <#-- variables passed from server-side code --> - - - -
-

Visit the Temporal Graph for grants of the Organization

-

This Organization has neither Sub-Organizations nor People. Please visit the Organization's profile page.

-
- diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl new file mode 100644 index 00000000..a0999e1b --- /dev/null +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl @@ -0,0 +1,12 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#assign standardVisualizationURLRoot ="/visualization"> + +<#assign organizationVivoProfileURL = "${urls.base}/individual?uri=${organizationURI?url}"> +<#assign temporalGraphURL = '${urls.base}${standardVisualizationURLRoot}?vis=${otherVisType}&uri=${organizationURI}&labelField=label'> + +
+

Visit the Temporal Graph for ${textForOtherEntityComparisonType} of the Organization.

+

This Organization has neither Sub-Organizations nor People with ${textForCurrentEntityComparisonType} in VIVO. Please visit the + Organization's profile page.

+
\ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityGrantComparisonError.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityGrantComparisonError.ftl new file mode 100644 index 00000000..aad4f1c0 --- /dev/null +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityGrantComparisonError.ftl @@ -0,0 +1,7 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#assign otherVisType = "entity_comparison"> +<#assign textForOtherEntityComparisonType = "publications"> +<#assign textForCurrentEntityComparisonType = "grants"> + +<#include "entityComparisonErrorCommonBody.ftl"> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityPublicationComparisonError.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityPublicationComparisonError.ftl new file mode 100644 index 00000000..7d736d38 --- /dev/null +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityPublicationComparisonError.ftl @@ -0,0 +1,7 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#assign otherVisType = "entity_grant_count"> +<#assign textForOtherEntityComparisonType = "grants"> +<#assign textForCurrentEntityComparisonType = "publications"> + +<#include "entityComparisonErrorCommonBody.ftl"> \ No newline at end of file diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java index d6087749..d123b61d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java @@ -274,14 +274,12 @@ public class EntityPublicationCountRequestHandler implements VitroRequest vitroRequest, String entityURI) { Portal portal = vitroRequest.getPortal(); - String visualization = "ENTITY_PUB_COUNT"; - String standaloneTemplate = "entityComparisonErrorActivator.ftl"; + String standaloneTemplate = "entityPublicationComparisonError.ftl"; Map body = new HashMap(); body.put("portalBean", portal); body.put("title", "Temporal Graph Visualization"); body.put("organizationURI", entityURI); - body.put("visualization", visualization); return new TemplateResponseValues(standaloneTemplate, body); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java index c88fed43..21619dc1 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java @@ -163,17 +163,14 @@ public class EntityGrantCountRequestHandler implements VitroRequest vitroRequest, String entityURI) { Portal portal = vitroRequest.getPortal(); - String visualization = "ENTITY_GRANT_COUNT"; - String standaloneTemplate = "entityComparisonErrorActivator.ftl"; + String standaloneTemplate = "entityGrantComparisonError.ftl"; Map body = new HashMap(); body.put("portalBean", portal); body.put("title", "Temporal Graph Visualization"); body.put("organizationURI", entityURI); - body.put("visualization", visualization); return new TemplateResponseValues(standaloneTemplate, body); - } From 78493a91a4463e04ea971c84f90f7fad9b8c9de2 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Mon, 7 Feb 2011 21:23:42 +0000 Subject: [PATCH 361/427] NIHVIVO-2056 Correct and improve queries for core:relatedRole list view --- .../config/listViewConfig-relatedRole.xml | 77 +++++++------------ 1 file changed, 28 insertions(+), 49 deletions(-) diff --git a/productMods/config/listViewConfig-relatedRole.xml b/productMods/config/listViewConfig-relatedRole.xml index 2a4449c1..73ea19d8 100644 --- a/productMods/config/listViewConfig-relatedRole.xml +++ b/productMods/config/listViewConfig-relatedRole.xml @@ -9,27 +9,26 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> - SELECT DISTINCT ?role (afn:localname(?role) AS ?roleName) + SELECT DISTINCT ?role (afn:localname(?role) AS ?roleName) + ?roleLabel ?roleTypeLabel ?indivInRole (afn:localname(?indivInRole) AS ?indivName) ?indivLabel - ?roleLabel ?roleTypeLabel ?dateTimeInterval ?dateTimeStart ?dateTimeEnd WHERE { ?subject ?property ?role - + + OPTIONAL { ?role rdfs:label ?roleLabel } + # We need ?subclass in query-base to get the roleTypeLabel for roles that # have no label (e.g., InvestigatorRole and its subclasses) - OPTIONAL { ?role a ?subclass . - ?subclass rdfs:subClassOf core:Role - OPTIONAL { ?subclass rdfs:label ?roleTypeLabel } - } - - OPTIONAL { ?roleProp rdfs:subPropertyOf core:roleOf . + OPTIONAL { ?role a ?subclass . + ?subclass rdfs:subClassOf core:Role + OPTIONAL { ?subclass rdfs:label ?roleTypeLabel } + ?roleProp rdfs:subPropertyOf core:roleOf ; + rdfs:domain ?subclass . ?role ?roleProp ?indivInRole OPTIONAL { ?indivInRole rdfs:label ?indivLabel } } - - OPTIONAL { ?role rdfs:label ?roleLabel } OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . @@ -39,12 +38,7 @@ ?dateTimeEndValue core:dateTime ?dateTimeEnd } } - # Make sure we get the role that goes with the role property - FILTER ( - ( ?roleProp != core:investigatorRoleOf || ?subclass = core:InvestigatorRole ) && - ( ?roleProp != core:principalInvestigatorRoleOf || ?subclass = core:PrincipalInvestigatorRole ) && - ( ?roleProp != core:co-PrincipalInvestigatorRoleOf || ?subclass = core:CoPrincipalInvestigatorRole ) - ) + } ORDER BY ?indivName ?indivLabel ?roleLabel ?roleTypeLabel @@ -55,24 +49,23 @@ SELECT DISTINCT ?subclass ?role (afn:localname(?role) AS ?roleName) + ?roleLabel ?roleTypeLabel ?indivInRole (afn:localname(?indivInRole) AS ?indivName) - ?indivLabel - ?roleLabel ?roleTypeLabel + ?indivLabel ?dateTimeInterval ?dateTimeStart ?dateTimeEnd WHERE { ?subject ?property ?role - + + OPTIONAL { ?role rdfs:label ?roleLabel } + OPTIONAL { ?role a ?subclass . ?subclass rdfs:subClassOf core:Role - OPTIONAL { ?subclass rdfs:label ?roleTypeLabel } - } - - OPTIONAL { ?roleProp rdfs:subPropertyOf core:roleOf . + OPTIONAL { ?subclass rdfs:label ?roleTypeLabel } + ?roleProp rdfs:subPropertyOf core:roleOf ; + rdfs:domain ?subclass . ?role ?roleProp ?indivInRole OPTIONAL { ?indivInRole rdfs:label ?indivLabel } } - - OPTIONAL { ?role rdfs:label ?roleLabel } OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . @@ -82,32 +75,21 @@ ?dateTimeEndValue core:dateTime ?dateTimeEnd } } - # Make sure we get the role that goes with the role property - FILTER ( - ( ?roleProp != core:investigatorRoleOf || ?subclass = core:InvestigatorRole ) && - ( ?roleProp != core:principalInvestigatorRoleOf || ?subclass = core:PrincipalInvestigatorRole ) && - ( ?roleProp != core:co-PrincipalInvestigatorRoleOf || ?subclass = core:CoPrincipalInvestigatorRole ) - ) + } ORDER BY ?subclass ?indivName ?indivLabel ?roleLabel ?roleTypeLabel - + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> CONSTRUCT { - ?subclass rdfs:subClassOf core:Role + ?subclass rdfs:subClassOf core:Role . + ?roleProp rdfs:subPropertyOf core:roleOf . + ?roleProp rdfs:domain ?subclass } WHERE { - ?subclass rdfs:subClassOf core:Role - } - - - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?roleProp rdfs:subPropertyOf core:roleOf - } WHERE { - ?roleProp rdfs:subPropertyOf core:roleOf + ?subclass rdfs:subClassOf core:Role . + ?roleProp rdfs:subPropertyOf core:roleOf ; + rdfs:domain ?subclass } @@ -169,9 +151,6 @@ ?dateTimeEndValue core:dateTime ?dateTimeEnd } - - + From b440465220642d5d2f757aa5b3f01c44022cf4b5 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Mon, 7 Feb 2011 22:15:29 +0000 Subject: [PATCH 362/427] Holly changes the CheckRepairMode test cases due to an unexpected message that needed to be confirmed. --- .../suites/AddRoles/CheckRepairMode.html | 7 ++++++- .../suites/AddRolesVB/CheckRepairMode.html | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html index f386259e..e5881b29 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html +++ b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html @@ -265,7 +265,12 @@ - pause + assertConfirmation + Are you sure you want to delete the property Member at Large related role? + + + + waitForPageToLoad 5000 diff --git a/utilities/acceptance-tests/suites/AddRolesVB/CheckRepairMode.html b/utilities/acceptance-tests/suites/AddRolesVB/CheckRepairMode.html index 55f03958..dc189311 100644 --- a/utilities/acceptance-tests/suites/AddRolesVB/CheckRepairMode.html +++ b/utilities/acceptance-tests/suites/AddRolesVB/CheckRepairMode.html @@ -264,6 +264,16 @@ //input[@value='Delete'] + + assertConfirmation + Are you sure you want to delete the property Member at Large related role? + + + + waitForPageToLoad + 5000 + + comment Verify role is gone From 35487d0f3066abffc34f41ef06270da4708708e6 Mon Sep 17 00:00:00 2001 From: cdtank Date: Mon, 7 Feb 2011 23:58:18 +0000 Subject: [PATCH 363/427] 1. Refactored some back-end code for temporal graph vis. 2. Made sure that if no uri is provided to grants temporal graph vis, then the one for highest level is selected. 3. Made sure that any entity (person or organization) directly attached to an organization is considered for temporal graph vis. 4. Changed the page title for temporal graph vis to always start with the label of the entity in question. --- .../EntityComparisonUtilityFunctions.java | 91 ++++++++ .../EntityPublicationCountQueryRunner.java | 7 +- .../EntityPublicationCountRequestHandler.java | 196 ++++++------------ .../EntityGrantCountQueryRunner.java | 80 ++++--- .../EntityGrantCountRequestHandler.java | 119 ++++++++--- .../freemarker/valueobjects/Entity.java | 4 +- .../freemarker/valueobjects/SubEntity.java | 4 +- 7 files changed, 301 insertions(+), 200 deletions(-) create mode 100644 src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java new file mode 100644 index 00000000..e2cde700 --- /dev/null +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java @@ -0,0 +1,91 @@ +package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.logging.Log; + +import com.hp.hpl.jena.query.DataSource; +import com.hp.hpl.jena.query.QuerySolution; +import com.hp.hpl.jena.query.ResultSet; +import com.hp.hpl.jena.rdf.model.RDFNode; + +import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; +import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.GenericQueryMap; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.GenericQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; + +public class EntityComparisonUtilityFunctions { + + public static String getHighestLevelOrganizationURI(ResultSet resultSet, + Map fieldLabelToOutputFieldLabel) { + + GenericQueryMap queryResult = new GenericQueryMap(); + + while (resultSet.hasNext()) { + QuerySolution solution = resultSet.nextSolution(); + + RDFNode organizationNode = solution + .get(fieldLabelToOutputFieldLabel.get("organization")); + + if (organizationNode != null) { + queryResult.addEntry( + fieldLabelToOutputFieldLabel.get("organization"), + organizationNode.toString()); + + return organizationNode.toString(); + + } + + RDFNode organizationLabelNode = solution + .get(fieldLabelToOutputFieldLabel.get("organizationLabel")); + + if (organizationLabelNode != null) { + queryResult.addEntry( + fieldLabelToOutputFieldLabel.get("organizationLabel"), + organizationLabelNode.toString()); + } + + RDFNode numberOfChildrenNode = solution.getLiteral("numOfChildren"); + + if (numberOfChildrenNode != null) { + queryResult.addEntry("numOfChildren", String + .valueOf(numberOfChildrenNode.asLiteral().getInt())); + } + } + + return ""; + } + + public static String getHighestLevelOrganizationURI(Log log, DataSource dataSource) + throws MalformedQueryParametersException { + + Map fieldLabelToOutputFieldLabel = new HashMap(); + fieldLabelToOutputFieldLabel.put("organization", + QueryFieldLabels.ORGANIZATION_URL); + fieldLabelToOutputFieldLabel.put("organizationLabel", + QueryFieldLabels.ORGANIZATION_LABEL); + + String aggregationRules = "(count(?organization) AS ?numOfChildren)"; + + String whereClause = "?organization rdf:type foaf:Organization ; rdfs:label ?organizationLabel . \n" + + "OPTIONAL { ?organization core:hasSubOrganization ?subOrg } . \n" + + "OPTIONAL { ?organization core:subOrganizationWithin ?parent } . \n" + + "FILTER ( !bound(?parent) ). \n"; + + String groupOrderClause = "GROUP BY ?organization ?organizationLabel \n" + + "ORDER BY DESC(?numOfChildren)\n" + "LIMIT 1\n"; + + QueryRunner highestLevelOrganizationQueryHandler = new GenericQueryRunner( + fieldLabelToOutputFieldLabel, aggregationRules, whereClause, + groupOrderClause, dataSource, log); + + String highestLevelOrgURI = EntityComparisonUtilityFunctions + .getHighestLevelOrganizationURI( + highestLevelOrganizationQueryHandler.getQueryResult(), + fieldLabelToOutputFieldLabel); + return highestLevelOrgURI; + } + +} diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java index 53359e3d..a0535307 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java @@ -87,7 +87,6 @@ public class EntityPublicationCountQueryRunner implements QueryRunner { Map subentityURLToVO = new HashMap(); Map personURLToVO = new HashMap(); - while (resultSet.hasNext()) { QuerySolution solution = resultSet.nextSolution(); @@ -149,7 +148,7 @@ public class EntityPublicationCountQueryRunner implements QueryRunner { entity.addSubEntity(subEntity); - subEntity.addPublications(biboDocument); + subEntity.addPublication(biboDocument); } RDFNode personURLNode = solution.get(QueryFieldLabels.PERSON_URL); @@ -182,11 +181,11 @@ public class EntityPublicationCountQueryRunner implements QueryRunner { } - person.addPublications(biboDocument); + person.addPublication(biboDocument); } - entity.addPublications(biboDocument); + entity.addPublication(biboDocument); } /* diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java index d123b61d..8cacdb65 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java @@ -19,25 +19,19 @@ import com.hp.hpl.jena.iri.IRI; import com.hp.hpl.jena.iri.IRIFactory; import com.hp.hpl.jena.iri.Violation; import com.hp.hpl.jena.query.DataSource; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; -import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.GenericQueryMap; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.GenericQueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; @@ -55,28 +49,10 @@ public class EntityPublicationCountRequestHandler implements String entityURI = vitroRequest .getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY); - if(StringUtils.isNotBlank(entityURI)){ + if (StringUtils.isNotBlank(entityURI)){ - QueryRunner queryManager = new EntityPublicationCountQueryRunner( - entityURI, dataSource, log); - - Entity entity = queryManager.getQueryResult(); - - if(entity.getEntityLabel().equals("no-label")){ - - return prepareStandaloneErrorResponse(vitroRequest,entityURI); - - } else { - - QueryRunner>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner( - entityURI, dataSource, log); - - Map> subOrganizationTypesResult = queryManagerForsubOrganisationTypes - .getQueryResult(); - - return prepareStandaloneResponse(vitroRequest, entity, entityURI, - subOrganizationTypesResult); - } + return getSubjectEntityAndGenerateResponse(vitroRequest, log, + dataSource, entityURI); } else { String staffProvidedHighestLevelOrganization = ConfigurationProperties.getProperty("visualization.topLevelOrg"); @@ -100,80 +76,59 @@ public class EntityPublicationCountRequestHandler implements } else { - QueryRunner queryManager = new EntityPublicationCountQueryRunner( - staffProvidedHighestLevelOrganization, dataSource, log); - - Entity entity = queryManager.getQueryResult(); - - if(entity.getEntityLabel().equals("no-label")){ - - return prepareStandaloneErrorResponse(vitroRequest,staffProvidedHighestLevelOrganization); - - } else { - - QueryRunner>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner( - staffProvidedHighestLevelOrganization, dataSource, log); - - Map> subOrganizationTypesResult = queryManagerForsubOrganisationTypes - .getQueryResult(); - - return prepareStandaloneResponse(vitroRequest, entity, staffProvidedHighestLevelOrganization, - subOrganizationTypesResult); - } + return getSubjectEntityAndGenerateResponse(vitroRequest, + log, dataSource, + staffProvidedHighestLevelOrganization); } } - Map fieldLabelToOutputFieldLabel = new HashMap(); - fieldLabelToOutputFieldLabel.put("organization", - QueryFieldLabels.ORGANIZATION_URL); - fieldLabelToOutputFieldLabel.put("organizationLabel", QueryFieldLabels.ORGANIZATION_LABEL); + String highestLevelOrgURI = EntityComparisonUtilityFunctions.getHighestLevelOrganizationURI(log, + dataSource); - String aggregationRules = "(count(?organization) AS ?numOfChildren)"; - - String whereClause = "?organization rdf:type foaf:Organization ; rdfs:label ?organizationLabel . \n" - + "OPTIONAL { ?organization core:hasSubOrganization ?subOrg } . \n" - + "OPTIONAL { ?organization core:subOrganizationWithin ?parent } . \n" - + "FILTER ( !bound(?parent) ). \n"; - - String groupOrderClause = "GROUP BY ?organization ?organizationLabel \n" - + "ORDER BY DESC(?numOfChildren)\n" - + "LIMIT 1\n"; - - QueryRunner highestLevelOrganizationQueryHandler = - new GenericQueryRunner(fieldLabelToOutputFieldLabel, - aggregationRules, - whereClause, - groupOrderClause, - dataSource, log); - - - String highestLevelOrgURI = getHighestLevelOrganizationURI( - highestLevelOrganizationQueryHandler.getQueryResult(), - fieldLabelToOutputFieldLabel); - - QueryRunner queryManager = new EntityPublicationCountQueryRunner( - highestLevelOrgURI, dataSource, log); - - Entity entity = queryManager.getQueryResult(); - - if(entity.getEntityLabel().equals("no-label")){ - - return prepareStandaloneErrorResponse(vitroRequest,highestLevelOrgURI); - - } else { - - QueryRunner>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner( - highestLevelOrgURI, dataSource, log); - - Map> subOrganizationTypesResult = queryManagerForsubOrganisationTypes - .getQueryResult(); - - return prepareStandaloneResponse(vitroRequest, entity, highestLevelOrgURI, - subOrganizationTypesResult); - } + return getSubjectEntityAndGenerateResponse(vitroRequest, log, + dataSource, highestLevelOrgURI); } } + + + private ResponseValues getSubjectEntityAndGenerateResponse( + VitroRequest vitroRequest, Log log, DataSource dataSource, + String subjectEntityURI) + throws MalformedQueryParametersException { + + QueryRunner queryManager = new EntityPublicationCountQueryRunner( + subjectEntityURI, dataSource, log); + + Entity entity = queryManager.getQueryResult(); + + if (entity.getEntityLabel().equals("no-label")) { + + return prepareStandaloneErrorResponse(vitroRequest, subjectEntityURI); + + } else { + + return getSubEntityTypesAndRenderStandaloneResponse( + vitroRequest, log, dataSource, + subjectEntityURI, entity); + } + } + + + private ResponseValues getSubEntityTypesAndRenderStandaloneResponse( + VitroRequest vitroRequest, Log log, DataSource dataSource, + String subjectEntityURI, Entity entity) + throws MalformedQueryParametersException { + + QueryRunner>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner( + subjectEntityURI, dataSource, log); + + Map> subOrganizationTypesResult = queryManagerForsubOrganisationTypes + .getQueryResult(); + + return prepareStandaloneResponse(vitroRequest, entity, subjectEntityURI, + subOrganizationTypesResult); + } @Override @@ -256,11 +211,15 @@ public class EntityPublicationCountRequestHandler implements String jsonContent = ""; jsonContent = writePublicationsOverTimeJSON(vreq, entity.getSubEntities(), subOrganizationTypesResult); + String title = ""; + if (StringUtils.isNotBlank(entity.getEntityLabel())) { + title = entity.getEntityLabel() + " - "; + } Map body = new HashMap(); body.put("portalBean", portal); - body.put("title", "Temporal Graph Visualization"); + body.put("title", title + "Temporal Graph Visualization"); body.put("organizationURI", entityURI); body.put("organizationLabel", entity.getEntityLabel()); body.put("jsonContent", jsonContent); @@ -292,7 +251,10 @@ public class EntityPublicationCountRequestHandler implements * @param subentities * @param subOrganizationTypesResult */ - private String writePublicationsOverTimeJSON(VitroRequest vreq, Set subentities, Map> subOrganizationTypesResult) { + private String writePublicationsOverTimeJSON(VitroRequest vreq, + Set subentities, + Map> + subOrganizationTypesResult) { Gson json = new Gson(); Set subEntitiesJson = new HashSet(); @@ -368,44 +330,4 @@ public class EntityPublicationCountRequestHandler implements } - private String getHighestLevelOrganizationURI(ResultSet resultSet, - Map fieldLabelToOutputFieldLabel) { - - GenericQueryMap queryResult = new GenericQueryMap(); - - - while (resultSet.hasNext()) { - QuerySolution solution = resultSet.nextSolution(); - - - RDFNode organizationNode = solution.get( - fieldLabelToOutputFieldLabel - .get("organization")); - - if (organizationNode != null) { - queryResult.addEntry(fieldLabelToOutputFieldLabel.get("organization"), organizationNode.toString()); - - return organizationNode.toString(); - - } - - RDFNode organizationLabelNode = solution.get( - fieldLabelToOutputFieldLabel - .get("organizationLabel")); - - if (organizationLabelNode != null) { - queryResult.addEntry(fieldLabelToOutputFieldLabel.get("organizationLabel"), organizationLabelNode.toString()); - } - - RDFNode numberOfChildrenNode = solution.getLiteral("numOfChildren"); - - if (numberOfChildrenNode != null) { - queryResult.addEntry("numOfChildren", String.valueOf(numberOfChildrenNode.asLiteral().getInt())); - } - } - - return ""; - } - - } \ No newline at end of file diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java index 5ed4f380..91bc36e1 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java @@ -7,6 +7,7 @@ import java.util.Map; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import com.hp.hpl.jena.iri.IRI; import com.hp.hpl.jena.iri.IRIFactory; @@ -24,8 +25,8 @@ import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Grant; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Grant; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; @@ -44,7 +45,7 @@ public class EntityGrantCountQueryRunner implements QueryRunner { private String entityURI; private DataSource dataSource; - private Log log; + private Log log = LogFactory.getLog(EntityGrantCountQueryRunner.class.getName()); private static final String SPARQL_QUERY_COMMON_SELECT_CLAUSE = "SELECT " @@ -101,7 +102,6 @@ public class EntityGrantCountQueryRunner implements QueryRunner { this.entityURI = entityURI; this.dataSource = dataSource; - this.log = log; } @@ -138,24 +138,28 @@ public class EntityGrantCountQueryRunner implements QueryRunner { grant.setGrantLabel(grantLabelNode.toString()); } - RDFNode grantStartDateNode = solution.get(QueryFieldLabels.ROLE_START_DATE); - if(grantStartDateNode != null){ + RDFNode grantStartDateNode = solution + .get(QueryFieldLabels.ROLE_START_DATE); + if (grantStartDateNode != null) { grant.setGrantStartDate(grantStartDateNode.toString()); - }else { - grantStartDateNode = solution.get(QueryFieldLabels.GRANT_START_DATE); - if(grantStartDateNode != null){ + } else { + grantStartDateNode = solution + .get(QueryFieldLabels.GRANT_START_DATE); + if (grantStartDateNode != null) { grant.setGrantStartDate(grantStartDateNode.toString()); } } - - RDFNode grantEndDateNode = solution.get(QueryFieldLabels.ROLE_END_DATE); - if(grantEndDateNode != null){ + + RDFNode grantEndDateNode = solution + .get(QueryFieldLabels.ROLE_END_DATE); + if (grantEndDateNode != null) { grant.setGrantEndDate(grantEndDateNode.toString()); - }else { - grantEndDateNode = solution.get(QueryFieldLabels.GRANT_END_DATE); - if(grantEndDateNode != null){ + } else { + grantEndDateNode = solution + .get(QueryFieldLabels.GRANT_END_DATE); + if (grantEndDateNode != null) { grant.setGrantEndDate(grantEndDateNode.toString()); - } + } } } @@ -178,39 +182,53 @@ public class EntityGrantCountQueryRunner implements QueryRunner { subEntity.setIndividualLabel(subEntityLabelNode.toString()); } entity.addSubEntity(subEntity); - subEntity.addGrants(grant); + subEntity.addGrant(grant); } - - + RDFNode personURLNode = solution.get(QueryFieldLabels.PERSON_URL); - - if(personURLNode != null){ - SubEntity person ; - if(personURLToVO.containsKey(personURLNode.toString())) { + + if (personURLNode != null) { + SubEntity person; + + if (personURLToVO.containsKey(personURLNode.toString())) { person = personURLToVO.get(personURLNode.toString()); } else { person = new SubEntity(personURLNode.toString()); personURLToVO.put(personURLNode.toString(), person); } + + RDFNode personLabelNode = solution + .get(QueryFieldLabels.PERSON_LABEL); - RDFNode personLabelNode = solution.get(QueryFieldLabels.PERSON_LABEL); if (personLabelNode != null) { person.setIndividualLabel(personLabelNode.toString()); } + + /* + * This makes sure that either, + * 1. the parent organization is a department-like organization with no organizations + * beneath it, or + * 2. the parent organizations has both sub-organizations and people directly + * attached to that organizations e.g. president of a university. + * */ + if (subEntityURLNode == null) { + + entity.addSubEntity(person); + + } -// entity.addSubEntity(person); - person.addGrants(grant); + person.addGrant(grant); } - - entity.addGrants(grant); + + entity.addGrant(grant); } - - if(subentityURLToVO.size() == 0 && personURLToVO.size() != 0){ - for(SubEntity person : personURLToVO.values()){ + + /*if (subentityURLToVO.size() == 0 && personURLToVO.size() != 0) { + for (SubEntity person : personURLToVO.values()) { entity.addSubEntity(person); } - } else if (subentityURLToVO.size() == 0 && personURLToVO.size() == 0){ + } else */if (subentityURLToVO.size() == 0 && personURLToVO.size() == 0) { entity = new Entity(this.entityURI, "no-label"); } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java index 21619dc1..00b416eb 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java @@ -14,21 +14,26 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import com.google.gson.Gson; +import com.hp.hpl.jena.iri.IRI; +import com.hp.hpl.jena.iri.IRIFactory; +import com.hp.hpl.jena.iri.Violation; import com.hp.hpl.jena.query.DataSource; +import edu.cornell.mannlib.vitro.webapp.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.EntityComparisonUtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.EntitySubOrganizationTypesQueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.EntitySubOrganizationTypesQueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; @@ -44,29 +49,50 @@ public class EntityGrantCountRequestHandler implements String entityURI = vitroRequest .getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY); - QueryRunner queryManager = new EntityGrantCountQueryRunner( - entityURI, dataSource, log); - - Entity entity = queryManager.getQueryResult(); - - if(entity.getEntityLabel().equals("no-label")){ - - return prepareStandaloneErrorResponse(vitroRequest,entityURI); - - } else{ + if (StringUtils.isNotBlank(entityURI)){ - QueryRunner>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner( - entityURI, dataSource, log); - - Map> subOrganizationTypesResult = queryManagerForsubOrganisationTypes - .getQueryResult(); - - return prepareStandaloneResponse(vitroRequest, entity, entityURI, - subOrganizationTypesResult); + return getSubjectEntityAndGenerateResponse(vitroRequest, log, + dataSource, entityURI); + + } else { + + String staffProvidedHighestLevelOrganization = ConfigurationProperties.getProperty("visualization.topLevelOrg"); + + /* + * First checking if the staff has provided highest level organization in deploy.properties + * if so use to temporal graph vis. + */ + if (StringUtils.isNotBlank(staffProvidedHighestLevelOrganization)) { + + /* + * To test for the validity of the URI submitted. + */ + IRIFactory iRIFactory = IRIFactory.jenaImplementation(); + IRI iri = iRIFactory.create(staffProvidedHighestLevelOrganization); + + if (iri.hasViolation(false)) { + + String errorMsg = ((Violation) iri.violations(false).next()).getShortMessage(); + log.error("Highest Level Organization URI provided is invalid " + errorMsg); + + } else { + + return getSubjectEntityAndGenerateResponse(vitroRequest, + log, dataSource, + staffProvidedHighestLevelOrganization); + } + } + + String highestLevelOrgURI = EntityComparisonUtilityFunctions.getHighestLevelOrganizationURI(log, + dataSource); + + return getSubjectEntityAndGenerateResponse(vitroRequest, log, + dataSource, highestLevelOrgURI); } + } - + @Override public Map generateDataVisualization( VitroRequest vitroRequest, Log log, DataSource dataSource) @@ -96,6 +122,44 @@ public class EntityGrantCountRequestHandler implements throw new UnsupportedOperationException("Entity Grant Count does not provide Ajax Response."); } + private ResponseValues getSubjectEntityAndGenerateResponse( + VitroRequest vitroRequest, Log log, DataSource dataSource, + String subjectEntityURI) + throws MalformedQueryParametersException { + + QueryRunner queryManager = new EntityGrantCountQueryRunner( + subjectEntityURI, dataSource, log); + + Entity entity = queryManager.getQueryResult(); + + if (entity.getEntityLabel().equals("no-label")) { + + return prepareStandaloneErrorResponse(vitroRequest, subjectEntityURI); + + } else { + + return getSubEntityTypesAndRenderStandaloneResponse( + vitroRequest, log, dataSource, + subjectEntityURI, entity); + } + } + + private ResponseValues getSubEntityTypesAndRenderStandaloneResponse( + VitroRequest vitroRequest, Log log, DataSource dataSource, + String subjectOrganization, Entity entity) + throws MalformedQueryParametersException { + + QueryRunner>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner( + subjectOrganization, dataSource, log); + + Map> subOrganizationTypesResult = queryManagerForsubOrganisationTypes + .getQueryResult(); + + return prepareStandaloneResponse(vitroRequest, entity, subjectOrganization, + subOrganizationTypesResult); + } + + /** * Provides response when json file containing the grant count over the * years is requested. @@ -146,11 +210,16 @@ public class EntityGrantCountRequestHandler implements String jsonContent = ""; jsonContent = writeGrantsOverTimeJSON(vreq, entity.getSubEntities(), subOrganizationTypesResult); + String title = ""; + if (StringUtils.isNotBlank(entity.getEntityLabel())) { + title = entity.getEntityLabel() + " - "; + } + Map body = new HashMap(); body.put("portalBean", portal); - body.put("title", "Temporal Graph Visualization"); + body.put("title", title + "Temporal Graph Visualization"); body.put("organizationURI", entityURI); body.put("organizationLabel", entity.getEntityLabel()); body.put("jsonContent", jsonContent); @@ -197,10 +266,12 @@ public class EntityGrantCountRequestHandler implements List currentGrantYear = new ArrayList(); if (grantEntry.getKey().equals( - VOConstants.DEFAULT_GRANT_YEAR)) + VOConstants.DEFAULT_GRANT_YEAR)) { currentGrantYear.add(-1); - else + } else { currentGrantYear.add(Integer.parseInt(grantEntry.getKey())); + } + currentGrantYear.add(grantEntry.getValue()); yearGrantCount.add(currentGrantYear); } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Entity.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Entity.java index db6729a6..3726a16d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Entity.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Entity.java @@ -41,7 +41,7 @@ public class Entity extends Individual{ return children; } - public void addPublications(BiboDocument biboDocument) { + public void addPublication(BiboDocument biboDocument) { this.publications.add(biboDocument); } @@ -55,7 +55,7 @@ public class Entity extends Individual{ } - public void addGrants(Grant grant) { + public void addGrant(Grant grant) { this.grants.add(grant); } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubEntity.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubEntity.java index 4a86259e..4dad26fa 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubEntity.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubEntity.java @@ -63,12 +63,12 @@ public class SubEntity extends Individual { return this.getIndividualLabel(); } - public void addPublications(BiboDocument biboDocument) { + public void addPublication(BiboDocument biboDocument) { this.publications.add(biboDocument); } - public void addGrants(Grant grant) { + public void addGrant(Grant grant) { this.grants.add(grant); } } From 0abd2aa86baa8e07b0b0fd7a52d72b064bdf9d10 Mon Sep 17 00:00:00 2001 From: cdtank Date: Tue, 8 Feb 2011 00:06:02 +0000 Subject: [PATCH 364/427] 1. Refactored common code for getting sub-organization types. --- .../EntityComparisonUtilityFunctions.java | 12 ++++++++++++ .../EntityPublicationCountRequestHandler.java | 14 ++++---------- .../EntityGrantCountRequestHandler.java | 16 +++++----------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java index e2cde700..b91b2861 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java @@ -2,6 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparis import java.util.HashMap; import java.util.Map; +import java.util.Set; import org.apache.commons.logging.Log; @@ -87,5 +88,16 @@ public class EntityComparisonUtilityFunctions { fieldLabelToOutputFieldLabel); return highestLevelOrgURI; } + + public static Map> getSubEntityTypes(Log log, + DataSource dataSource, String subjectOrganization) + throws MalformedQueryParametersException { + QueryRunner>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner( + subjectOrganization, dataSource, log); + + Map> subOrganizationTypesResult = queryManagerForsubOrganisationTypes + .getQueryResult(); + return subOrganizationTypesResult; + } } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java index 8cacdb65..9cf5e9a9 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java @@ -120,11 +120,8 @@ public class EntityPublicationCountRequestHandler implements String subjectEntityURI, Entity entity) throws MalformedQueryParametersException { - QueryRunner>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner( - subjectEntityURI, dataSource, log); - - Map> subOrganizationTypesResult = queryManagerForsubOrganisationTypes - .getQueryResult(); + Map> subOrganizationTypesResult = EntityComparisonUtilityFunctions.getSubEntityTypes( + log, dataSource, subjectEntityURI); return prepareStandaloneResponse(vitroRequest, entity, subjectEntityURI, subOrganizationTypesResult); @@ -144,11 +141,8 @@ public class EntityPublicationCountRequestHandler implements Entity entity = queryManager.getQueryResult(); - - QueryRunner>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner( - entityURI, dataSource, log); - - Map> subOrganizationTypesResult = queryManagerForsubOrganisationTypes.getQueryResult(); + Map> subOrganizationTypesResult = EntityComparisonUtilityFunctions.getSubEntityTypes( + log, dataSource, entityURI); return prepareDataResponse(entity, entity.getSubEntities(),subOrganizationTypesResult); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java index 00b416eb..37d68651 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java @@ -107,10 +107,8 @@ public class EntityGrantCountRequestHandler implements Entity entity = queryManager.getQueryResult(); - QueryRunner>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner( - entityURI, dataSource, log); - - Map> subOrganizationTypesResult = queryManagerForsubOrganisationTypes.getQueryResult(); + Map> subOrganizationTypesResult = EntityComparisonUtilityFunctions.getSubEntityTypes( + log, dataSource, entityURI); return prepareDataResponse(entity, entity.getSubEntities(),subOrganizationTypesResult); @@ -149,17 +147,13 @@ public class EntityGrantCountRequestHandler implements String subjectOrganization, Entity entity) throws MalformedQueryParametersException { - QueryRunner>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner( - subjectOrganization, dataSource, log); - - Map> subOrganizationTypesResult = queryManagerForsubOrganisationTypes - .getQueryResult(); + Map> subOrganizationTypesResult = EntityComparisonUtilityFunctions.getSubEntityTypes( + log, dataSource, subjectOrganization); return prepareStandaloneResponse(vitroRequest, entity, subjectOrganization, subOrganizationTypesResult); } - - + /** * Provides response when json file containing the grant count over the * years is requested. From 6eb0317148524b57877b570caa748c93f2bc0757 Mon Sep 17 00:00:00 2001 From: sjm222 Date: Tue, 8 Feb 2011 01:03:36 +0000 Subject: [PATCH 365/427] NIHVIVO-2013 - remove AcademicTerm and AcademicYear from events class group --- .../WEB-INF/filegraph/tbox/scires-1.2.owl | 12 +- .../WEB-INF/filegraph/tbox/vivo-core-1.2.owl | 2412 ++++++++--------- .../user/vivo-core-1.2-annotations.rdf | 4 +- productMods/WEB-INF/submodels/scires-1.2.owl | 12 +- .../WEB-INF/submodels/vivo-core-1.2.owl | 2412 ++++++++--------- 5 files changed, 2425 insertions(+), 2427 deletions(-) diff --git a/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl b/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl index d4b121ad..20405ecb 100644 --- a/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl +++ b/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl @@ -29,9 +29,9 @@ An implement used to facilitate work, especially precision work. + An implement used to facilitate work, especially precision work. - A plan specification that allows different domain experts to reliably and independently reproduce a process. @@ -64,6 +64,11 @@ + + + + + @@ -157,9 +162,4 @@ NOTE: For now we are not addressing whether this is a subclass of foaf:Agent - - - - - diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl index 8eba2a5d..c678b1ab 100644 --- a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl +++ b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl @@ -34,19 +34,19 @@ Notes or annotations about a resource stable + + + 1 + + - - - - - - - + + @@ -65,11 +65,6 @@ - - - - - For individual seminars, use seminar instead. core:ConferenceSeries and core:SeminarSeries are very similar. @@ -80,10 +75,10 @@ - + - 1 - + + @@ -106,30 +101,35 @@ A person who is enrolled in an educational institution. Use only if no specific subclasses of core:Student describe the person. + + + + + - - + UN Cartographic Section UN Cartographic Section + + + + + + - - - 1 - - - + @@ -141,19 +141,14 @@ Accounting & Research Services Assistant; Director of Information Technology Staff, support, and other non-academic positions. - A position classified as professional, staff, support, or any other non-academic role + A position classified as professional, staff, support, or any other non-academic role - - - 1 - - http://purl.org/ontology/bibo/ A sub property of identifier (http://en.wikipedia.org/wiki/SICI). @@ -162,11 +157,6 @@ Serial Item and Contribution Identifier - - - - - @@ -183,6 +173,11 @@ A government agency is a permanent or semi-permanent organization in the machinery of government that is responsible for the oversight and administration of specific functions. + + + + + @@ -190,6 +185,11 @@ Public description modified from the information on this page: http://www.w3.org/TR/2005/WD-swbp-skos-core-guide-20050510/#sechierarchy . + + + + + @@ -219,6 +219,11 @@ + + + 1 + + Definition take from: http://xmlns.com/foaf/spec/#term_based_near . foaf indicates that the status of this term is "unstable". "The based_near relationship relates two "spatial things" (anything that can be somewhere), the latter typically described using the geo:lat / geo:long geo-positioning vocabulary (http://www.w3.org/2003/01/geo/wgs84_pos#). This allows us to say describe the typical latitute and longitude of, say, a Person (people are spatial things - they can be places) without implying that a precise location has been given." @@ -229,25 +234,30 @@ Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - + + 1 + - The most general classification of a person - + The most general classification of a person - + + + + + + + http://purl.org/ontology/bibo/ @@ -261,10 +271,10 @@ - - - + + + @@ -272,10 +282,15 @@ - + - - + 1 + + + + + 1 + @@ -285,20 +300,10 @@ http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - + - - - - - - - - - - - - + + @@ -314,6 +319,11 @@ Encompasses talk, speech, lecture, slide lecture, conference presentation + + + 1 + + @@ -325,11 +335,6 @@ - - - 1 - - Smaller administrative division into which a country may be divided. @@ -339,7 +344,6 @@ - @@ -352,10 +356,11 @@ + - + - + @@ -365,26 +370,41 @@ + + + - + - - - + + + + + + + + + + + + - - + + + + + @@ -393,11 +413,6 @@ - - - 1 - - @@ -421,6 +436,11 @@ http://www.fao.org/termportal/contr/fr/ FAO terminology + + + + + 2010-06-24 @@ -434,11 +454,6 @@ http://www.fao.org/termportal/contr/es/ http://www.fao.org/termportal/contr/ar/ - - - - - @@ -453,15 +468,30 @@ + + + + + + + + + + Audiovisual recording in video format - - + - + 1 + + + + + + @@ -472,23 +502,33 @@ http://purl.org/ontology/bibo/ something that is printed or published and distributed, esp. a given number of a periodical - + + + + + + 1 - + + + + + + An explicit individual period considered by an academic institution to be its primary academic cycle. - + - 1 - + + @@ -519,10 +559,10 @@ UN Statistics Division - + - - + 1 + http://faostat.fao.org @@ -534,25 +574,30 @@ http://faostat.fao.org/default.aspx?lang=es FAOSTAT http://faostat.fao.org - + - 1 - + + + + + + + Currently being used by a restriction on organization. - + - 1 - + + @@ -587,8 +632,13 @@ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.iso.org/iso/fr/country_codes/iso_3166_code_lists.htm + + + + + - + @@ -605,15 +655,25 @@ This class allows for linking an author to a publication while indicating inform Bibo Definition: A seminar, discussion group, or the like, that emphasizes exchange of ideas and the demonstration and application of techniques, skills, etc. - + + + + + + 1 - + - + - - + + + + + + + @@ -624,11 +684,6 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ - - - - - aka movie. http://purl.org/ontology/bibo/ @@ -637,30 +692,55 @@ This class allows for linking an author to a publication while indicating inform stable + + + 1 + + - + Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio Independent organizations formally working together toward a common goal, under an expressed agreement + - + + + + + + + + + + - - + + A group of related documents issued at regular intervals. - http://purl.org/ontology/bibo/ + stable + - + + + + + + + + + + @@ -697,21 +777,16 @@ This class allows for linking an author to a publication while indicating inform Short Definition take from http://en.wiktionary.org/wiki/continent. - + 1 - + - - - - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/en/ @@ -725,12 +800,27 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ 2010-06-24 + + + 1 + + + + + 1 + + + + + + + This is done through a restriction on the foaf:Person class. @@ -751,6 +841,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + This is done through a restriction on the foaf:Person class. @@ -761,11 +856,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - This is done through a restriction on academic degree to allow the values from to be foaf:organization to be used as the range. @@ -794,11 +884,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - http://faostat.fao.org/site/377/default.aspx @@ -842,9 +927,19 @@ This class allows for linking an author to a publication while indicating inform - - - + + + + + + + + + + + + + @@ -855,17 +950,17 @@ This class allows for linking an author to a publication while indicating inform A legal decision that affirms a ruling. + + + + + - - - - - Something designed, built, installed, etc., to serve a specific function or activity affording a convenience or service. Distinct from the organization that runs it; e.g., a laboratory may be an organization but may be run by another organization and only consist of facilities housing equipment or services. Can be a building or place that provides a particular service or is used for a particular activity. Use the specific Building or Room whenever possible. Short definition from http://dictionary.reference.com/browse/facility. @@ -878,15 +973,20 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + - + - - + + + + + + + @@ -914,6 +1014,11 @@ This class allows for linking an author to a publication while indicating inform Public Description from source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers the bibo:presents and the bibo:presentedAt unstable terms. It also indicates that bibo:presents is a sub-property of event:product. + + + + + 2010-06-24 @@ -928,10 +1033,10 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/es/ - + - 1 - + 1 + @@ -950,10 +1055,10 @@ This class allows for linking an author to a publication while indicating inform Either city or town - a thickly populated area having fixed boundaries and certain local powers of government. - + + + - 1 - @@ -965,21 +1070,26 @@ This class allows for linking an author to a publication while indicating inform That is a position held by an academic faculty member who works for administration. - Associate Dean - + An academic administrative position (associate dean, etc.) as distinct from a professional administrative position (non-academic) + - + server; Bruker Vector-33 FT-IR - + + A network server is one example. Medical schools and research laboratories can list professional equipment, such as microscopes. - A physical object provided for specific purpose, task or occupation. + + + + + A description (often numeric) that locates an item within a containing document or collection. @@ -993,38 +1103,38 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ A specific journal article - A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a periodical or book + Short Definition modified from the bibo ontology. - A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine. - + stable + + + Director of Admissions and Placement; Associate University Librarian Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. An employment activity, whether compensated or not. Short definition comes from http://en.wikipedia.org/wiki/Position, and has been modified. - - + + + + + - - - - - The thesis degree. @@ -1036,10 +1146,10 @@ This class allows for linking an author to a publication while indicating inform The source of the public description and this info is found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html. Bibo considers this term "unstable". The bibo editorial note is: "We are not defining, using an enumeration, the range of the bibo:degree to the defined list of bibo:ThesisDegree. We won't do it because we want people to be able to define new degress if needed by some special usecases. Creating such an enumeration would restrict this to happen." + An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials - @@ -1057,6 +1167,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + Relates a document to an event; for example, a paper to a conference. @@ -1091,28 +1206,28 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + + + + 1 + + Use for teaching roles other than specific for-credit courses within a person's home institution. Use for teaching experiences other than specific for-credit courses within a person's home institution. - - - - - - - - - - http://faostat.fao.org/DesktopDefault.aspx?PageID=550&lang=fr#ancor @@ -1130,8 +1245,13 @@ This class allows for linking an author to a publication while indicating inform US Patent Data; US Job Data A named collection of data, usually containing only one type of data + + + 1 + + - + Computer program and its related documentation; directs the operation of a computer @@ -1150,11 +1270,6 @@ This class allows for linking an author to a publication while indicating inform Definiton from Bibo here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html - - - - - http://purl.org/ontology/bibo/ @@ -1174,6 +1289,11 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + http://www.fao.org/termportal/contr/es/ @@ -1188,11 +1308,6 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 http://www.fao.org/termportal/contr/en/ - - - - - My extension program consists of developing and reporting disease management strategies that are both economically and environmentally sound for fresh market vegetable production. We hope that some of this testing will result in practices adaptable for organic production. @@ -1230,15 +1345,30 @@ This class allows for linking an author to a publication while indicating inform Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. + + + + + + + + 1 + + + + + 1 + + A person working in a position of librarian or information professional, or academic or technical expert in support of providing information services or materials. - + + - 1 - + http://www.fao.org/termportal/contr/zh/ @@ -1253,27 +1383,17 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 FAO terminology - - - - - stable - + A scholarly academic article, typically published in a journal. + http://purl.org/ontology/bibo/ Written by scholars for other scholars, typically published in an academic journal with an abstract and bibliography - A specific academic journal article - - - - - @@ -1285,10 +1405,15 @@ This class allows for linking an author to a publication while indicating inform - + - - + 1 + + + + + 1 + @@ -1304,11 +1429,6 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ - - - - - http://www.un.org/Depts/Cartographic/english/htmain.htm http://www.un.org/Depts/Cartographic/english/htmain.htm @@ -1320,32 +1440,12 @@ This class allows for linking an author to a publication while indicating inform http://www.un.org/Depts/Cartographic/french/htmain.htm UN Cartographic Section - - - 1 - - - - - 1 - - - - - - - - - - - - http://purl.org/dc/terms/ http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html @@ -1359,11 +1459,6 @@ This class allows for linking an author to a publication while indicating inform Role of a person designated by a grantee to direct a project or activity being supported by a grant, and who is accountable to the grantee for the proper conduct of the project or activity. Also known as Program Director or Project Director. - - - 1 - - Definition take from here: http://dictionary.reference.com/browse/school. @@ -1384,6 +1479,11 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/en/ + + + + + http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -1397,16 +1497,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/es/ - - - - - - - - - - @@ -1429,20 +1519,15 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - - + Definition taken from: http://en.wikipedia.org/wiki/University University of Florida; Washington University in St. Louis An institution of higher education and research, which grants academic degrees in a variety of subjects, and provides both undergraduate education and postgraduate education. - + @@ -1453,65 +1538,50 @@ This class allows for linking an author to a publication while indicating inform Definition from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html - - - - - Top level of all location classes. It's anticipated that the subclasses will be used when classifying items. And, all locations can be viewable via this class. Use subclasses of core:Location when classsifying items. - - - 1 - - - - - 1 - - A document created as a basis for discussion or a very early draft of a formal paper - - + + - - + + - + - + + 1 - - + - - - - - - Used for a single narrative summary of teaching, typically covering a wide range of courses including for credit and non-credit teaching over multiple semesters; the "teaches" property links a person directly with an instance of a Semester Class, typically from an institutional database of record; then use Teacher Role for information about a person's role in non-credit teaching or their specific contribution to individual courses + + + + + + source: http://en.wikipedia.org/wiki/Issn @@ -1527,20 +1597,10 @@ This class allows for linking an author to a publication while indicating inform source of definition: http://www.uspto.gov/main/glossary/#p . The following site has patent number formats: http://www.uspto.gov/patents/ebc/kindcodesum.jsp . - + - 1 - - - - - 1 - - - - - 1 - + + @@ -1554,11 +1614,11 @@ This class allows for linking an author to a publication while indicating inform Articles usually contain abstracts and bibliographies. Includes peer-reviewed, non-peer-reviewed, and open access journals. Journals are usually indexed in the major academic databases such as PubMed and Web of Science. + stable A periodical of scholarly journal Articles. Contains original scholarly research or review articles by experts in the field Journal of Information Science; IEEE Intelligent System; Scientometrics - http://purl.org/ontology/bibo/ @@ -1569,15 +1629,10 @@ This class allows for linking an author to a publication while indicating inform Contains news articles, opinions, features, advertising, and is usually issued daily or weekly - + + + - - - - - - - @@ -1596,34 +1651,29 @@ This class allows for linking an author to a publication while indicating inform FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/fr/ + + + 1 + + - - - 1 - - - - - - - - - + + + + + + + - - - 1 - - @@ -1633,20 +1683,15 @@ This class allows for linking an author to a publication while indicating inform - + + + - 1 - - - - - - + Wiley Prize in Biomedical Sciences - An Award or Honor An Award or Honor @@ -1663,16 +1708,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - - - - - - @@ -1687,27 +1722,22 @@ This class allows for linking an author to a publication while indicating inform An agent that receives a communication document. - - - - - - - - - Only use if no specific subclasses of core:EventSeries desribe the activity. - - A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. - - Two or more events that follow on one after the other or are connected one after the other. - - + + + Only use if no specific subclasses of core:EventSeries desribe the activity. + + + A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. + + + Two or more events that follow on one after the other or are connected one after the other. + Enter building name. If the building's name is a number (as in many governmental organizations such as national laboratories and military bases), then enter it. Do not confuse with the number that appears in a postal address. @@ -1716,25 +1746,25 @@ This class allows for linking an author to a publication while indicating inform + + + + + - + 1 - + - - - - - - - - + + + @@ -1742,10 +1772,10 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + @@ -1760,15 +1790,10 @@ This class allows for linking an author to a publication while indicating inform use one freetextKeyword assertion for each keyword or phrase. - - - - - - - - + + 1 + @@ -1776,19 +1801,29 @@ use one freetextKeyword assertion for each keyword or phrase. We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - + 1 - + - + + + + + + 1 - + + + + + + @@ -1797,29 +1832,29 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - + + + + + Represents educational training that has been received. - This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree. Currently any abstract name is given to individuals of this class. This could change in the future. - - + - 1 - + 1 + - + A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue - + @@ -1829,14 +1864,19 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ - Facebook; VIVOweb.org; Flickr A group of Webpages accessible on the Web. + A group of webpages available within a specific parent address or URL on the World Wide Web unstable + + + 1 + + FAO terminology @@ -1850,30 +1890,15 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/zh/ - + - - - - - - 1 - - - - - - - - - - 1 - + 1 + - Work consisting of collections of previously published works + Short Definition is the Medical Subject Heading (MeSH) definition A document that simultaneously contains other documents. @@ -1885,6 +1910,16 @@ We would like the range of core:outcome to be the union of Event and Process; an a reified relationship + + + + + + + + 1 + + @@ -1894,7 +1929,7 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition modified from http://www.thefreedictionary.com/division. It is difficult to tell the difference between a division and a department. Cardiovascular Medicine (division within medicine) - + The Ornithological Newsletter @@ -1902,34 +1937,39 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + The bibo:reviewOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . As of 26 May 2010, bibo:reviewOf is used with the class Review, but core:reviewIn doesn't seem to be being used. + + + + + VIVO Outreach Team; VIVO Ontology Team - + An informal organization brought together for the purposes of a project or event. - - - - - In the future we may be able to make this a defined class that would not need to be directly asserted, but the consensus seems to be that some organizations "are" clinical and some "are" research organizations and that the distinction is important enough to warrant the additional class and class assertions Any organization with a significant clinical function as a matter of course and not just through occasional clinical roles - - + - + 1 + @@ -1958,11 +1998,11 @@ We would like the range of core:outcome to be the union of Event and Process; an The academic degree of a Thesis + Alchohol Education Center; Center for Arts and Public Policy; Hearing Research Center A place where a particular activity or service is concentrated. - Short Definition take from http://www.thefreedictionary.com/center. @@ -1976,7 +2016,7 @@ We would like the range of core:outcome to be the union of Event and Process; an http://faostat.fao.org/site/377/default.aspx FAOSTAT http://faostat.fao.org/site/377/default.aspx - + @@ -1994,14 +2034,14 @@ We would like the range of core:outcome to be the union of Event and Process; an + Short Definition from OCLC Input Standards, EntW A document created to summarize research findings associated with the completion of an academic degree. stable + http://purl.org/ontology/bibo/ Works created to satisfy the requirements for an academic certification or degree; also called dissertation - - @@ -2010,10 +2050,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - 1 - + + @@ -2021,6 +2061,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + UN Statistics Division @@ -2034,10 +2079,15 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + - Only use if no specific subclasses of core:Role describe the role. - + Only use if no specific subclasses of core:Role describe the role. + A person's or organization's type of contribution to an endeavor Only use this broad role class if no subclasses of role describe the item being classified. @@ -2047,15 +2097,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - - - - - - + 1 + @@ -2070,19 +2115,19 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + + - 1 - - - - - - + + + + + @@ -2102,7 +2147,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A structured file of information or a set of logically related data stored and retrieved using computer-based means Short Definition is the Medical Subject Heading (MeSH) definition - + PubMed @@ -2112,26 +2157,21 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - - - - - - + + stable http://purl.org/ontology/bibo/ A meeting for consultation or discussion. 2010 International Congress on Autoimmunity; American Libraries Association 2009 + core:Seminar and bibo:Conference are very similar. A meeting for consultation or discussion. - @@ -2140,42 +2180,52 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + + A distinct, usually ongoing and specialized unit within a large organization. - Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division. Legal (department within a company); Use for any non-academic department - + + + - 1 - - + - - + + - - - + + + An online article or commentary appearing on a blog - + A specific blog posting + + + 1 + + + Collection of documents or information resources that have a unified identity stable Collection of documents or information resources that have a unified identity. Archives, museums and libraries often acquire collections on specific subjects and from distinguished authors or researchers. Also includes collections of resources bundled into a license. - http://purl.org/ontology/bibo/ Hill Ornithology Collection; Wiley Interscience Online Books Biochemisty Collection A collection of Documents or Collections @@ -2197,10 +2247,10 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition obtained here: http://answers.ask.com/Business/Finance/what_is_a_private_company. Examples of private companies found here: http://www.forbes.com/2008/11/03/largest-private-companies-biz-privates08-cx_sr_1103private_land.html - + - - + + @@ -2208,12 +2258,12 @@ We would like the range of core:outcome to be the union of Event and Process; an + + B.A. Bachelor of Arts This list may have multiple abbreviations for some degrees. An academic degree at any level, both as reported by individuals for employment and as offered by academic degree programs. - - @@ -2259,31 +2309,21 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - + + + + phonograph record; tape; CD; DVD; DAT An audio document; aka record. http://purl.org/ontology/bibo/ stable - Recorded audio in any format - - - - - - - - 1 - - http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49chgef.htm @@ -2305,6 +2345,21 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ + + + + + + + + 1 + + + + + + + FAO terminology @@ -2318,17 +2373,12 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ 2010-06-24 - - - - - http://purl.org/ontology/bibo/ film; video; Blu-ray Audiovisual recording in any format - + stable An audio-visual document; film, video, and so forth. @@ -2401,16 +2451,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - 1 - - @@ -2419,27 +2459,37 @@ We would like the range of core:outcome to be the union of Event and Process; an - A defined class of organizations that fund Grants. National Institute of Health (NIH) + - + Definition found here: http://dictionary.reference.com/browse/publisher A person or company whose business is the publishing of books, periodicals, engravings, computer software, etc. Elsevier; Harper & Row; Indiana University Press - + - - + + + + + + + + + + + 1 + @@ -2458,11 +2508,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Afghanistan; Antigua and Barbuda; Cameroon; Iceland; Jamaica; Nigeria; United States of America - - - - - @@ -2471,15 +2516,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - 1 - - - - - - + + @@ -2506,12 +2546,17 @@ We would like the range of core:outcome to be the union of Event and Process; an Uniform Resource Locator (URL) specifies where an identified resource is available and the mechanism for retrieving it. http://info.slis.indiana.edu/~katy/ - + - + - - + 1 + + + + + 1 + @@ -2531,11 +2576,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - @@ -2544,11 +2584,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable - - - - - http://www.fao.org/termportal/contr/ar/ @@ -2563,17 +2598,17 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + + + - - - - - Short Definition copied from bibo ontology @@ -2589,16 +2624,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Public Definition source (http://www.answers.com/topic/publisher). - - - 1 - - - - - - - An Institute normally has a research focus but may also fulfill instructional or outreach roles. @@ -2606,18 +2631,18 @@ We would like the range of core:outcome to be the union of Event and Process; an Institute for Fundamental Theory - - + + This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. Only use if no specific subclasses of foaf:organization desribe the organization. - - + A generic class encompassing several types of organizations. - - + + - + + Ued to describe an organization related to bibliographic items such as a publishing company, etc. @@ -2639,11 +2664,21 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + A Person holding an academic employment appointment focused on research rather than teaching; temporary (or for some defined term) + + + + + @@ -2652,26 +2687,16 @@ We would like the range of core:outcome to be the union of Event and Process; an definition modified from: source (http://en.wikipedia.org/wiki/Seating_capacity). 55 - - - + + - - - - 1 - + The digital file (or physical equivalent), if available after the conference, vs. the act of attending/presenting: use ConferencePresentation for information about date/time/location/name of the event where the poster was presented - - - 1 - - An organized series of workshop events, whether repetitions of the same workshop or multiple different workshops. Use workshop for individual events. @@ -2683,6 +2708,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + @@ -2695,29 +2725,29 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - + - Only use if no specific subclasses of event:Event are appropriate. - - + This class will also display instances of subclasses under Event, e.g. Philosophy Department Discussion Club; 2009 Racker Lecture; screening of a documentary. In addition to a location in space and time, an event may have any or all the following qualities: actively participating agents, passive factors, work products. Also, it may be in a virtual space or part of a series such as a lecture series. The previous short definition was: "An arbitrary classification of a space/time region, by a cognitive agent." - - - Something that happens at a given place and time. - - - + + + + + + Something that happens at a given place and time. + + + + - + - - + 1 + @@ -2727,11 +2757,6 @@ The previous short definition was: "An arbitrary classification of a space/time http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - - - - - http://www.fao.org/termportal/en/ @@ -2745,16 +2770,6 @@ The previous short definition was: "An arbitrary classification of a space/time http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - 1 - - - - - 1 - - @@ -2767,11 +2782,6 @@ The previous short definition was: "An arbitrary classification of a space/time - - - 1 - - A visual representation such as a photograph or graph @@ -2797,12 +2807,12 @@ The previous short definition was: "An arbitrary classification of a space/time - - + An award, honor, or distinction received by a person on a particular date (not the award itself as given repeatedly, and not a grant award). - + A specific award on a particular date or for a particular date range. + Ninth annual Wiley Prize in Biomedical Sciences, for the discovery of a light activated ion channel @@ -2821,10 +2831,10 @@ The previous short definition was: "An arbitrary classification of a space/time Draft legislation presented for discussion to a legal body. stable - + + + - - @@ -2833,33 +2843,18 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - - - - 1 - - Role of co-principal investigator of a grant, who devotes a specified percentage of time and is considered key personnel. - - - - - - Professor, associate professor and assistant professor are common positions for academic faculty. + Professor; Associate Professor; Assistant Professor Academic position in a university or institution + - @@ -2874,43 +2869,38 @@ The previous short definition was: "An arbitrary classification of a space/time The dual relationship of a professor advising a student and the student being advised by a professor, typically including start and end dates - + - + - 1 - + + - - - 1 - - - + - - + 1 + + + + + + An explicit individual academic term, quarter, or semester rather than the generic fall, spring or summer semester. - - - - - A form of qualitative descriptive research that is used to study individuals, a small group of participants, or a group as a whole. Medical usage (from MeSH): clinical presentations that may be followed by evaluative studies that eventually lead to a diagnosis. @@ -2927,26 +2917,16 @@ modern society using the world of Star trek. Los Angeles Times, March An section number - + + + - - - - - - - - - - - - http://www.fao.org/termportal/contr/en/ http://www.fao.org/termportal/contr/es/ @@ -2973,37 +2953,22 @@ modern society using the world of Star trek. Los Angeles Times, March An agent that interview another agent. - - - - - - + - - + + - + - - - - - - - - - - - - + 1 + @@ -3017,10 +2982,10 @@ modern society using the world of Star trek. Los Angeles Times, March a specific period or duration, defined by (optional) start and end date/times. - - + + - + @@ -3038,22 +3003,22 @@ modern society using the world of Star trek. Los Angeles Times, March Short Definition from bibo ontology + + + 1 + + + + + + + - - + + - - - - - - - - - - - + @@ -3081,17 +3046,17 @@ modern society using the world of Star trek. Los Angeles Times, March 2010-06-24 http://www.fao.org/termportal/contr/zh/ + + + 1 + + The value of the datatype property *validSince* associated to a particular area (territory or group) indicates the area's first year of validity. The geopolitical ontology traces back historic changes only until 1985, therefore, if an area has a validSince = 1985, this indicates that the area is/was valid since 1985 or before. - - - - - @@ -3104,10 +3069,10 @@ modern society using the world of Star trek. Los Angeles Times, March - + - - + + @@ -3165,10 +3130,10 @@ Examples of a Publisher include a person, an organization, or a service. Typical A presentation of a series of slides, usually presented in front of an audience with written text and images. stable - + - - + + @@ -3202,10 +3167,10 @@ Examples of a Publisher include a person, an organization, or a service. Typical http://purl.org/ontology/bibo/ - - + - + 1 + http://www.fao.org/termportal/contr/es/ @@ -3220,15 +3185,10 @@ Examples of a Publisher include a person, an organization, or a service. Typical 2010-06-24 - + - 1 - - - - - - + + @@ -3236,19 +3196,19 @@ Examples of a Publisher include a person, an organization, or a service. Typical Resource dependent on other entities This class is here so it can be equivalent to vitro:DependentResource. Deletion in the VIVO system behaves differently when deleting members of this class: related individuals may need to be deleted as well. + + + 1 + + A distinct, usually specialized educational unit within an educational organization. - - + + Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts) - - - - - @@ -3274,6 +3234,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/A passage selected from a larger work. http://purl.org/ontology/bibo/ + + + + + @@ -3283,28 +3248,38 @@ Definition source: http://isiwebofknowledge.com/researcherid/Critical or explanatory note for a Document. - + - - + 1 + - + + + - An intramural or extramural award to support scholarly work, such as UF09179 (VIVO) Short definition is from the Glossary of NIH Terms. - - - Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity + + + + + + + Written musical composition for voice or instruments or both + + + + + 2010-06-24 http://www.fao.org/termportal/contr/ar/ @@ -3327,21 +3302,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/A legal decision that reverses a ruling. http://purl.org/ontology/bibo/ - - - - - Information Science; Computer Science; Anthropology - + 1 - + This namespace - http://purl.org/dc/elements/1.1/ - does not appear to have this element. @@ -3372,6 +3342,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/2010-06-24 http://www.fao.org/termportal/en/ + + + 1 + + Universal Product Code @@ -3386,10 +3361,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + - + + @@ -3398,21 +3373,36 @@ Definition source: http://isiwebofknowledge.com/researcherid/Intel Talent Search; poetry contest Not the same as an award or distinction. - + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + 1 + + @@ -3427,12 +3417,22 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable + + + + + + + + 1 + + @@ -3449,10 +3449,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ 0.7 - + - - + + http://purl.org/ontology/bibo/ @@ -3467,18 +3467,23 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Address has properties for department name, street, city, state or province, postal code, and country. For US specific address, classify using core:US Postal Code. core:Address will display all addresses. - University of Waterloo, 200 University Avenue West, Waterloo, Ontario, Canada N2L 3G1 + A code and abstract concept expressing a location on the Earth's surface. To classify US specific addresses, use core:US Postal Code. + Librarian; Library Systems Analyst; Music Bibliographer It is the common position in libraries. + A position held by library and information science professionals, or academic or technical experts, in support of providing information services or materials - - + + + + 1 + http://www.fao.org/termportal/contr/zh/ @@ -3493,30 +3498,35 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/es/ - + + + - - - + + - - + - - - + + + - - - + + + + + + + + @@ -3525,6 +3535,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + http://purl.org/ontology/bibo/ stable @@ -3533,10 +3548,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/Library of Congress Control Number Source: http://en.wikipedia.org/wiki/Library_of_Congress_Control_Number. - + - 1 - + 1 + @@ -3545,10 +3560,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + - + 1 + @@ -3569,8 +3584,8 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A group of people organized for a specific purpose (e.g., a reporting or advisory role), often with a charge and for a specific duration. + There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important. - Short Definition from OCLC Input Standards, EntW @@ -3589,6 +3604,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/http://purl.org/ontology/bibo/ a document that states some contractual relationship or grants some right + + + + + @@ -3605,13 +3625,13 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + 1320 East 10th Street, Wells Library 021 Bloomington, IN 47405 - + Formal address in US postal address system. + US postal address follow the format street, apt or office number (optional), city, state, and zipcode. @@ -3621,15 +3641,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + - - - 1 - - @@ -3644,16 +3664,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print. - - - + Short Definition from the bibo ontology unstable A section of a book - + + http://purl.org/ontology/bibo/ + A section of a book. @@ -3667,10 +3687,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - 1 - + + + + + + + @@ -3686,11 +3711,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - radio or newspaper interview @@ -3700,6 +3720,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable + + + + + @@ -3714,11 +3739,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/The Getty Museum A building or place where works of art, scientific specimens, or other objects of permanent value are kept and displayed. - - - 1 - - unstable http://purl.org/ontology/bibo/ @@ -3727,6 +3747,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3752,6 +3777,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3762,6 +3792,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3787,10 +3822,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + + - 1 - + A small reference book, especially one giving instructions. @@ -3828,10 +3863,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ B.A. - + - 1 - + + + + + + + @@ -3850,6 +3890,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + + + + + + For example, National Science Foundation providesFundingThrough Graduate Research Fellowship Program; National Institutes of Health providesFundingThrough National Center for Research Resources. @@ -3883,11 +3933,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3915,11 +3960,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/Used for a single narrative summary of research, typically covering a wide range of activities and time periods; use Researcher Role for information on individual activities - - - - - A role involving research (funded or unfunded), sometimes linked to a grant @@ -3927,11 +3967,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Bacteria-resistant bandage; Termite prevention system; Hurricane resistant houses - - - - - Relates a document to some transcribed original. The bibo:transcriptOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers this term unstable. @@ -3995,11 +4030,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - FAO terminology @@ -4026,10 +4056,20 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/ar/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - + + + 1 + + + + + + 2 + + + + - - @@ -4063,11 +4103,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - @@ -4080,11 +4115,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - The concept name, URL, and source vocabulary name of a Subject Area. http://www.getty.edu/vow/AATHierarchy?find=&logic=AND&note=&english=N&subjectid=300000000 @@ -4113,6 +4143,11 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/en/ + + + + + @@ -4136,18 +4171,18 @@ bibo has the domain of this property set to the union of Collection and Document - - - + A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate + + Short Definition from the bibo ontology stable http://purl.org/ontology/bibo/ - - + + A document (noun) is a bounded physical representation of body of information designed with the capacity (and usually intent) to communicate. A document may manifest symbolic, diagrammatic or sensory-representational information. - A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate + @@ -4155,17 +4190,17 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + - - - - - FAO terminology 2010-06-24 @@ -4227,16 +4262,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi An edited book. - - http://purl.org/ontology/bibo/ - + + Best American Science Writing 2009 stable An edited collection of stand-alone articles published as a book + Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible. @@ -4245,15 +4280,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Short definition obtained here: http://en.wiktionary.org/wiki/geopolitical_entity. - + - - - - - - - + + @@ -4261,6 +4291,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + 100 Caldwell Hall; 114 Martha Van Rensselaer (Rushmore Conference Room) Room that provides a particular service or is used for a particular activity. @@ -4268,64 +4303,59 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Enter room number of name. - + + - - - - - - - + - + - - + + + + + + + - - - - - - - - - - - - - - - - - + - - - - - + + - - - - - + + + + - - + + + + + + + + + + + + + + + + + + - - - - - + + + + @@ -4333,25 +4363,15 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Medicine - - - - - - - - + + + - - + - - - - - 1 - + + http://www.fao.org/termportal/en/ @@ -4371,6 +4391,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Examples shows a book has French language version. Public description source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . + + + + + @@ -4378,6 +4403,26 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + 1 + + + + + + + + + + + + + + + + + http://www.fao.org/termportal/contr/fr/ @@ -4394,39 +4439,24 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi College of Arts & Sciences; Ivy Tech Community College - A primary academic unit within a University or a free-standing higher education organization without graduate degree programs. - - - - - - - - - - + Document1 isVersionOf Document2 This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - + - - + + - + - - - - - 1 - + @@ -4446,27 +4476,42 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://data.worldbank.org/indicator/NY.GDP.MKTP.CD + + + 1 + + - - - + + + - - - + + 1 + + + + + + - + + + + + + @@ -4496,36 +4541,21 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - - - - - - - 2 - - + - - - + + + - - - - - @@ -4537,23 +4567,18 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://xmlns.com/foaf/spec/#term_firstName. Note from foaf: "The lastName property is provided (alongside firstName) as a mechanism to support legacy data that cannot be easily interpreted in terms of the (otherwise preferred) familyName and givenName properties. The concepts of 'first' and 'last' names do not work well across cultural and linguistic boundaries; however they are widely used in addressbooks and databases." - - - 1 - - - - - - - - UITS service UITS service is the information technology services provided by Indiana University. SC. - + A regularly offered service in support of an academic, research, or administrative function (not personal or professional service by an individual) + + + + + + @@ -4561,23 +4586,13 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - - - - 1 - - - + - - + + @@ -4602,15 +4617,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - - - - - - 1 - + + @@ -4626,27 +4636,12 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - This is done with a restriction on agent. - - 1 - - - - - - - - Code of Federal Regulations @@ -4657,21 +4652,31 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi A work consisting of texts of rules and regulations related to statutes issued by executive or administrative agencies A collection of statutes. + + + + + An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support - - - + + + + + + + + + Used information from this definition: http://dictionary.reference.com/browse/library. A collection of any materials, for study and enjoyment, which has been systematically arranged. - Marston Science Library @@ -4688,30 +4693,20 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ - - + + - + - - + + - + - 1 - - - - - - - - - - - + + http://www.fao.org/termportal/contr/ar/ @@ -4744,19 +4739,29 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - - - + + + 1 + + + + + - - + + + - + + + + + @@ -4765,15 +4770,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi full email address - + - - - - - - 1 - + + @@ -4781,29 +4781,24 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - + - - + + Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. - - - - + + + + - + - + + + - - - - - - - @@ -4811,11 +4806,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Chicago; New York; Bloomington; Gainesville - - - - - @@ -4828,30 +4818,35 @@ We would like the range of core:outcome to be the union of Event and Process; an For data ingest from authoritative sources to record the actual way a person was listed as author, as potentially valuable information for author disambiguation. + + + 1 + + + + + + + + + + 1 + + + + + + + A person who has already received a bachelor's degree and is working toward a Master's or Doctoral degree. - - - - - - - - 1 - - - - - 1 - - @@ -4865,29 +4860,29 @@ We would like the range of core:outcome to be the union of Event and Process; an http://aims.fao.org/website/Search-AGROVOC/sub http://aims.fao.org/website/Search-AGROVOC/sub + + + + + Used to link a bibliographic item to one of its contributor: can be an author, an editor, a publisher, etc. - - + - + + - + - - + + - + - - - - - - - + + @@ -4906,11 +4901,26 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + Any organization (likely also asserted as another class of Organization) with a primary, ongoing research function, not just through occasional roles + + + 1 + + + + + + + @@ -4921,22 +4931,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - administrative secretary Definition http://en.wikipedia.org/wiki/Job_title#Job_title. - - - 1 - - @@ -4956,21 +4956,16 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - - - - - - + 1 + Medical Subject Heading (MeSH) definition of Technical Report: Work consisting of a formal report giving details of the investigation and results of a medical or other scientific problem. When issued by a government agency or comparable official body, its contents may be classified, unclassified, or declassified with regard to security clearance. This publication type may also cover a scientific paper or article that records the current state or current position of scientific research and development. If so labeled by the editor or publisher, this publication type may be properly used for journal articles. A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc.. - + http://purl.org/ontology/bibo/ A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc. @@ -4994,6 +4989,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/es/ FAO terminology + + + 1 + + 2010-06-24 http://www.fao.org/termportal/en/ @@ -5013,14 +5013,14 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - + + + - - - + + + + @@ -5037,15 +5037,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + + - - - + - - + 1 + @@ -5064,11 +5064,21 @@ We would like the range of core:outcome to be the union of Event and Process; an An organized series of a meeting for consultation or discussion. + + + 1 + + A person registered in an undergraduate program leading to a bachelor's degree or an undergraduate diploma or certificate. + + + 1 + + An excerpted collection of words @@ -5079,10 +5089,10 @@ We would like the range of core:outcome to be the union of Event and Process; an Short Definition from the bibo ontology - + + A position involving academic work but without faculty status Researcher; Academic Extension Associate; Postdoctoral Associate - Those positions are held by people who do academic work but do not have faculty positions in universities or institutes. @@ -5092,6 +5102,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + Currently being used by a restriction on organization. @@ -5104,11 +5119,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - The example is one outreach role required by US space agency NASA, which is related with one project in NASA. Name of the outreach role should be put here. @@ -5116,21 +5126,21 @@ We would like the range of core:outcome to be the union of Event and Process; an An outreach or community service role directed outside a person's primary profession and institution Communicating Astronomy to the Public - + - 1 - + + stable - A loose, thematic, collection of Documents, often Books. A thematic collection of documents, usually books, issued at regular or irregular intervals http://purl.org/ontology/bibo/ - + Methods in Molecular Biology + @@ -5138,6 +5148,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + Definition take from: http://dictionary.reference.com/browse/foundation. An institution financed by a donation or legacy to aid research, education, the arts, etc. @@ -5162,11 +5177,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik An identifier of serials, still in use by libraries, but replaced by ISSN for any new work stable - - - - - This is done with a restriction on agent. @@ -5179,6 +5189,16 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + 1 + + + + + + + @@ -5196,10 +5216,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Short Definition modified from the one found here: http://www.thefreedictionary.com/county. - + Alachua; Baker; Bradford; Kenora; Ottawa; Waterloo The largest administrative division of most states or provinces. + + + + + Home page for Scopus: http://www.scopus.com/home.url @@ -5223,44 +5248,34 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - - - - - - - + Short Definition from the bibo ontology - A distinct part of a larger document or collected document http://purl.org/ontology/bibo/ a distinct part of a larger document or collected document. - + unstable + - + + + - - - - + + Short Definition copied from bibo ontology - + http://purl.org/ontology/bibo/ - A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers. + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers stable @@ -5281,15 +5296,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + - - + + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. - An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. - @@ -5297,11 +5312,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - @@ -5313,10 +5323,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A URLLink that is designated (by the user or anyone else) as a primary link for the person, organization, event, etc. - - - + + + @@ -5369,10 +5379,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - - + + http://www.fao.org/termportal/contr/zh/ @@ -5392,11 +5402,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - @@ -5432,15 +5437,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/termportal/en/ 2010-06-24 - + - 1 - - - - - - + + @@ -5468,12 +5468,12 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + A list of items in a collection; an ordered compilation of item descriptions and sufficient information to afford access to them + NLM Catalog - Short Definition is the Medical Subject Heading (MeSH) definition - diff --git a/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf b/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf index 31631cbb..d69f5ad4 100644 --- a/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf +++ b/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf @@ -73,7 +73,6 @@ -1 -1 - sourceVocabularyReference @@ -863,11 +862,10 @@ - + Academic Year -1 -1 - Academic Year diff --git a/productMods/WEB-INF/submodels/scires-1.2.owl b/productMods/WEB-INF/submodels/scires-1.2.owl index d4b121ad..20405ecb 100644 --- a/productMods/WEB-INF/submodels/scires-1.2.owl +++ b/productMods/WEB-INF/submodels/scires-1.2.owl @@ -29,9 +29,9 @@ An implement used to facilitate work, especially precision work. + An implement used to facilitate work, especially precision work. - A plan specification that allows different domain experts to reliably and independently reproduce a process. @@ -64,6 +64,11 @@ + + + + + @@ -157,9 +162,4 @@ NOTE: For now we are not addressing whether this is a subclass of foaf:Agent - - - - - diff --git a/productMods/WEB-INF/submodels/vivo-core-1.2.owl b/productMods/WEB-INF/submodels/vivo-core-1.2.owl index 8eba2a5d..c678b1ab 100644 --- a/productMods/WEB-INF/submodels/vivo-core-1.2.owl +++ b/productMods/WEB-INF/submodels/vivo-core-1.2.owl @@ -34,19 +34,19 @@ Notes or annotations about a resource stable + + + 1 + + - - - - - - - + + @@ -65,11 +65,6 @@ - - - - - For individual seminars, use seminar instead. core:ConferenceSeries and core:SeminarSeries are very similar. @@ -80,10 +75,10 @@ - + - 1 - + + @@ -106,30 +101,35 @@ A person who is enrolled in an educational institution. Use only if no specific subclasses of core:Student describe the person. + + + + + - - + UN Cartographic Section UN Cartographic Section + + + + + + - - - 1 - - - + @@ -141,19 +141,14 @@ Accounting & Research Services Assistant; Director of Information Technology Staff, support, and other non-academic positions. - A position classified as professional, staff, support, or any other non-academic role + A position classified as professional, staff, support, or any other non-academic role - - - 1 - - http://purl.org/ontology/bibo/ A sub property of identifier (http://en.wikipedia.org/wiki/SICI). @@ -162,11 +157,6 @@ Serial Item and Contribution Identifier - - - - - @@ -183,6 +173,11 @@ A government agency is a permanent or semi-permanent organization in the machinery of government that is responsible for the oversight and administration of specific functions. + + + + + @@ -190,6 +185,11 @@ Public description modified from the information on this page: http://www.w3.org/TR/2005/WD-swbp-skos-core-guide-20050510/#sechierarchy . + + + + + @@ -219,6 +219,11 @@ + + + 1 + + Definition take from: http://xmlns.com/foaf/spec/#term_based_near . foaf indicates that the status of this term is "unstable". "The based_near relationship relates two "spatial things" (anything that can be somewhere), the latter typically described using the geo:lat / geo:long geo-positioning vocabulary (http://www.w3.org/2003/01/geo/wgs84_pos#). This allows us to say describe the typical latitute and longitude of, say, a Person (people are spatial things - they can be places) without implying that a precise location has been given." @@ -229,25 +234,30 @@ Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - + + 1 + - The most general classification of a person - + The most general classification of a person - + + + + + + + http://purl.org/ontology/bibo/ @@ -261,10 +271,10 @@ - - - + + + @@ -272,10 +282,15 @@ - + - - + 1 + + + + + 1 + @@ -285,20 +300,10 @@ http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - + - - - - - - - - - - - - + + @@ -314,6 +319,11 @@ Encompasses talk, speech, lecture, slide lecture, conference presentation + + + 1 + + @@ -325,11 +335,6 @@ - - - 1 - - Smaller administrative division into which a country may be divided. @@ -339,7 +344,6 @@ - @@ -352,10 +356,11 @@ + - + - + @@ -365,26 +370,41 @@ + + + - + - - - + + + + + + + + + + + + - - + + + + + @@ -393,11 +413,6 @@ - - - 1 - - @@ -421,6 +436,11 @@ http://www.fao.org/termportal/contr/fr/ FAO terminology + + + + + 2010-06-24 @@ -434,11 +454,6 @@ http://www.fao.org/termportal/contr/es/ http://www.fao.org/termportal/contr/ar/ - - - - - @@ -453,15 +468,30 @@ + + + + + + + + + + Audiovisual recording in video format - - + - + 1 + + + + + + @@ -472,23 +502,33 @@ http://purl.org/ontology/bibo/ something that is printed or published and distributed, esp. a given number of a periodical - + + + + + + 1 - + + + + + + An explicit individual period considered by an academic institution to be its primary academic cycle. - + - 1 - + + @@ -519,10 +559,10 @@ UN Statistics Division - + - - + 1 + http://faostat.fao.org @@ -534,25 +574,30 @@ http://faostat.fao.org/default.aspx?lang=es FAOSTAT http://faostat.fao.org - + - 1 - + + + + + + + Currently being used by a restriction on organization. - + - 1 - + + @@ -587,8 +632,13 @@ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.iso.org/iso/fr/country_codes/iso_3166_code_lists.htm + + + + + - + @@ -605,15 +655,25 @@ This class allows for linking an author to a publication while indicating inform Bibo Definition: A seminar, discussion group, or the like, that emphasizes exchange of ideas and the demonstration and application of techniques, skills, etc. - + + + + + + 1 - + - + - - + + + + + + + @@ -624,11 +684,6 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ - - - - - aka movie. http://purl.org/ontology/bibo/ @@ -637,30 +692,55 @@ This class allows for linking an author to a publication while indicating inform stable + + + 1 + + - + Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio Independent organizations formally working together toward a common goal, under an expressed agreement + - + + + + + + + + + + - - + + A group of related documents issued at regular intervals. - http://purl.org/ontology/bibo/ + stable + - + + + + + + + + + + @@ -697,21 +777,16 @@ This class allows for linking an author to a publication while indicating inform Short Definition take from http://en.wiktionary.org/wiki/continent. - + 1 - + - - - - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/en/ @@ -725,12 +800,27 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ 2010-06-24 + + + 1 + + + + + 1 + + + + + + + This is done through a restriction on the foaf:Person class. @@ -751,6 +841,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + This is done through a restriction on the foaf:Person class. @@ -761,11 +856,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - This is done through a restriction on academic degree to allow the values from to be foaf:organization to be used as the range. @@ -794,11 +884,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - http://faostat.fao.org/site/377/default.aspx @@ -842,9 +927,19 @@ This class allows for linking an author to a publication while indicating inform - - - + + + + + + + + + + + + + @@ -855,17 +950,17 @@ This class allows for linking an author to a publication while indicating inform A legal decision that affirms a ruling. + + + + + - - - - - Something designed, built, installed, etc., to serve a specific function or activity affording a convenience or service. Distinct from the organization that runs it; e.g., a laboratory may be an organization but may be run by another organization and only consist of facilities housing equipment or services. Can be a building or place that provides a particular service or is used for a particular activity. Use the specific Building or Room whenever possible. Short definition from http://dictionary.reference.com/browse/facility. @@ -878,15 +973,20 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + - + - - + + + + + + + @@ -914,6 +1014,11 @@ This class allows for linking an author to a publication while indicating inform Public Description from source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers the bibo:presents and the bibo:presentedAt unstable terms. It also indicates that bibo:presents is a sub-property of event:product. + + + + + 2010-06-24 @@ -928,10 +1033,10 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/es/ - + - 1 - + 1 + @@ -950,10 +1055,10 @@ This class allows for linking an author to a publication while indicating inform Either city or town - a thickly populated area having fixed boundaries and certain local powers of government. - + + + - 1 - @@ -965,21 +1070,26 @@ This class allows for linking an author to a publication while indicating inform That is a position held by an academic faculty member who works for administration. - Associate Dean - + An academic administrative position (associate dean, etc.) as distinct from a professional administrative position (non-academic) + - + server; Bruker Vector-33 FT-IR - + + A network server is one example. Medical schools and research laboratories can list professional equipment, such as microscopes. - A physical object provided for specific purpose, task or occupation. + + + + + A description (often numeric) that locates an item within a containing document or collection. @@ -993,38 +1103,38 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ A specific journal article - A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a periodical or book + Short Definition modified from the bibo ontology. - A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine. - + stable + + + Director of Admissions and Placement; Associate University Librarian Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. An employment activity, whether compensated or not. Short definition comes from http://en.wikipedia.org/wiki/Position, and has been modified. - - + + + + + - - - - - The thesis degree. @@ -1036,10 +1146,10 @@ This class allows for linking an author to a publication while indicating inform The source of the public description and this info is found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html. Bibo considers this term "unstable". The bibo editorial note is: "We are not defining, using an enumeration, the range of the bibo:degree to the defined list of bibo:ThesisDegree. We won't do it because we want people to be able to define new degress if needed by some special usecases. Creating such an enumeration would restrict this to happen." + An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials - @@ -1057,6 +1167,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + Relates a document to an event; for example, a paper to a conference. @@ -1091,28 +1206,28 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + + + + 1 + + Use for teaching roles other than specific for-credit courses within a person's home institution. Use for teaching experiences other than specific for-credit courses within a person's home institution. - - - - - - - - - - http://faostat.fao.org/DesktopDefault.aspx?PageID=550&lang=fr#ancor @@ -1130,8 +1245,13 @@ This class allows for linking an author to a publication while indicating inform US Patent Data; US Job Data A named collection of data, usually containing only one type of data + + + 1 + + - + Computer program and its related documentation; directs the operation of a computer @@ -1150,11 +1270,6 @@ This class allows for linking an author to a publication while indicating inform Definiton from Bibo here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html - - - - - http://purl.org/ontology/bibo/ @@ -1174,6 +1289,11 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + http://www.fao.org/termportal/contr/es/ @@ -1188,11 +1308,6 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 http://www.fao.org/termportal/contr/en/ - - - - - My extension program consists of developing and reporting disease management strategies that are both economically and environmentally sound for fresh market vegetable production. We hope that some of this testing will result in practices adaptable for organic production. @@ -1230,15 +1345,30 @@ This class allows for linking an author to a publication while indicating inform Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. + + + + + + + + 1 + + + + + 1 + + A person working in a position of librarian or information professional, or academic or technical expert in support of providing information services or materials. - + + - 1 - + http://www.fao.org/termportal/contr/zh/ @@ -1253,27 +1383,17 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 FAO terminology - - - - - stable - + A scholarly academic article, typically published in a journal. + http://purl.org/ontology/bibo/ Written by scholars for other scholars, typically published in an academic journal with an abstract and bibliography - A specific academic journal article - - - - - @@ -1285,10 +1405,15 @@ This class allows for linking an author to a publication while indicating inform - + - - + 1 + + + + + 1 + @@ -1304,11 +1429,6 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ - - - - - http://www.un.org/Depts/Cartographic/english/htmain.htm http://www.un.org/Depts/Cartographic/english/htmain.htm @@ -1320,32 +1440,12 @@ This class allows for linking an author to a publication while indicating inform http://www.un.org/Depts/Cartographic/french/htmain.htm UN Cartographic Section - - - 1 - - - - - 1 - - - - - - - - - - - - http://purl.org/dc/terms/ http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html @@ -1359,11 +1459,6 @@ This class allows for linking an author to a publication while indicating inform Role of a person designated by a grantee to direct a project or activity being supported by a grant, and who is accountable to the grantee for the proper conduct of the project or activity. Also known as Program Director or Project Director. - - - 1 - - Definition take from here: http://dictionary.reference.com/browse/school. @@ -1384,6 +1479,11 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/en/ + + + + + http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -1397,16 +1497,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/es/ - - - - - - - - - - @@ -1429,20 +1519,15 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - - + Definition taken from: http://en.wikipedia.org/wiki/University University of Florida; Washington University in St. Louis An institution of higher education and research, which grants academic degrees in a variety of subjects, and provides both undergraduate education and postgraduate education. - + @@ -1453,65 +1538,50 @@ This class allows for linking an author to a publication while indicating inform Definition from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html - - - - - Top level of all location classes. It's anticipated that the subclasses will be used when classifying items. And, all locations can be viewable via this class. Use subclasses of core:Location when classsifying items. - - - 1 - - - - - 1 - - A document created as a basis for discussion or a very early draft of a formal paper - - + + - - + + - + - + + 1 - - + - - - - - - Used for a single narrative summary of teaching, typically covering a wide range of courses including for credit and non-credit teaching over multiple semesters; the "teaches" property links a person directly with an instance of a Semester Class, typically from an institutional database of record; then use Teacher Role for information about a person's role in non-credit teaching or their specific contribution to individual courses + + + + + + source: http://en.wikipedia.org/wiki/Issn @@ -1527,20 +1597,10 @@ This class allows for linking an author to a publication while indicating inform source of definition: http://www.uspto.gov/main/glossary/#p . The following site has patent number formats: http://www.uspto.gov/patents/ebc/kindcodesum.jsp . - + - 1 - - - - - 1 - - - - - 1 - + + @@ -1554,11 +1614,11 @@ This class allows for linking an author to a publication while indicating inform Articles usually contain abstracts and bibliographies. Includes peer-reviewed, non-peer-reviewed, and open access journals. Journals are usually indexed in the major academic databases such as PubMed and Web of Science. + stable A periodical of scholarly journal Articles. Contains original scholarly research or review articles by experts in the field Journal of Information Science; IEEE Intelligent System; Scientometrics - http://purl.org/ontology/bibo/ @@ -1569,15 +1629,10 @@ This class allows for linking an author to a publication while indicating inform Contains news articles, opinions, features, advertising, and is usually issued daily or weekly - + + + - - - - - - - @@ -1596,34 +1651,29 @@ This class allows for linking an author to a publication while indicating inform FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/fr/ + + + 1 + + - - - 1 - - - - - - - - - + + + + + + + - - - 1 - - @@ -1633,20 +1683,15 @@ This class allows for linking an author to a publication while indicating inform - + + + - 1 - - - - - - + Wiley Prize in Biomedical Sciences - An Award or Honor An Award or Honor @@ -1663,16 +1708,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - - - - - - @@ -1687,27 +1722,22 @@ This class allows for linking an author to a publication while indicating inform An agent that receives a communication document. - - - - - - - - - Only use if no specific subclasses of core:EventSeries desribe the activity. - - A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. - - Two or more events that follow on one after the other or are connected one after the other. - - + + + Only use if no specific subclasses of core:EventSeries desribe the activity. + + + A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. + + + Two or more events that follow on one after the other or are connected one after the other. + Enter building name. If the building's name is a number (as in many governmental organizations such as national laboratories and military bases), then enter it. Do not confuse with the number that appears in a postal address. @@ -1716,25 +1746,25 @@ This class allows for linking an author to a publication while indicating inform + + + + + - + 1 - + - - - - - - - - + + + @@ -1742,10 +1772,10 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + @@ -1760,15 +1790,10 @@ This class allows for linking an author to a publication while indicating inform use one freetextKeyword assertion for each keyword or phrase. - - - - - - - - + + 1 + @@ -1776,19 +1801,29 @@ use one freetextKeyword assertion for each keyword or phrase. We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - + 1 - + - + + + + + + 1 - + + + + + + @@ -1797,29 +1832,29 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - + + + + + Represents educational training that has been received. - This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree. Currently any abstract name is given to individuals of this class. This could change in the future. - - + - 1 - + 1 + - + A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue - + @@ -1829,14 +1864,19 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ - Facebook; VIVOweb.org; Flickr A group of Webpages accessible on the Web. + A group of webpages available within a specific parent address or URL on the World Wide Web unstable + + + 1 + + FAO terminology @@ -1850,30 +1890,15 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/zh/ - + - - - - - - 1 - - - - - - - - - - 1 - + 1 + - Work consisting of collections of previously published works + Short Definition is the Medical Subject Heading (MeSH) definition A document that simultaneously contains other documents. @@ -1885,6 +1910,16 @@ We would like the range of core:outcome to be the union of Event and Process; an a reified relationship + + + + + + + + 1 + + @@ -1894,7 +1929,7 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition modified from http://www.thefreedictionary.com/division. It is difficult to tell the difference between a division and a department. Cardiovascular Medicine (division within medicine) - + The Ornithological Newsletter @@ -1902,34 +1937,39 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + The bibo:reviewOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . As of 26 May 2010, bibo:reviewOf is used with the class Review, but core:reviewIn doesn't seem to be being used. + + + + + VIVO Outreach Team; VIVO Ontology Team - + An informal organization brought together for the purposes of a project or event. - - - - - In the future we may be able to make this a defined class that would not need to be directly asserted, but the consensus seems to be that some organizations "are" clinical and some "are" research organizations and that the distinction is important enough to warrant the additional class and class assertions Any organization with a significant clinical function as a matter of course and not just through occasional clinical roles - - + - + 1 + @@ -1958,11 +1998,11 @@ We would like the range of core:outcome to be the union of Event and Process; an The academic degree of a Thesis + Alchohol Education Center; Center for Arts and Public Policy; Hearing Research Center A place where a particular activity or service is concentrated. - Short Definition take from http://www.thefreedictionary.com/center. @@ -1976,7 +2016,7 @@ We would like the range of core:outcome to be the union of Event and Process; an http://faostat.fao.org/site/377/default.aspx FAOSTAT http://faostat.fao.org/site/377/default.aspx - + @@ -1994,14 +2034,14 @@ We would like the range of core:outcome to be the union of Event and Process; an + Short Definition from OCLC Input Standards, EntW A document created to summarize research findings associated with the completion of an academic degree. stable + http://purl.org/ontology/bibo/ Works created to satisfy the requirements for an academic certification or degree; also called dissertation - - @@ -2010,10 +2050,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - 1 - + + @@ -2021,6 +2061,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + UN Statistics Division @@ -2034,10 +2079,15 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + - Only use if no specific subclasses of core:Role describe the role. - + Only use if no specific subclasses of core:Role describe the role. + A person's or organization's type of contribution to an endeavor Only use this broad role class if no subclasses of role describe the item being classified. @@ -2047,15 +2097,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - - - - - - + 1 + @@ -2070,19 +2115,19 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + + - 1 - - - - - - + + + + + @@ -2102,7 +2147,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A structured file of information or a set of logically related data stored and retrieved using computer-based means Short Definition is the Medical Subject Heading (MeSH) definition - + PubMed @@ -2112,26 +2157,21 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - - - - - - + + stable http://purl.org/ontology/bibo/ A meeting for consultation or discussion. 2010 International Congress on Autoimmunity; American Libraries Association 2009 + core:Seminar and bibo:Conference are very similar. A meeting for consultation or discussion. - @@ -2140,42 +2180,52 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + + A distinct, usually ongoing and specialized unit within a large organization. - Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division. Legal (department within a company); Use for any non-academic department - + + + - 1 - - + - - + + - - - + + + An online article or commentary appearing on a blog - + A specific blog posting + + + 1 + + + Collection of documents or information resources that have a unified identity stable Collection of documents or information resources that have a unified identity. Archives, museums and libraries often acquire collections on specific subjects and from distinguished authors or researchers. Also includes collections of resources bundled into a license. - http://purl.org/ontology/bibo/ Hill Ornithology Collection; Wiley Interscience Online Books Biochemisty Collection A collection of Documents or Collections @@ -2197,10 +2247,10 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition obtained here: http://answers.ask.com/Business/Finance/what_is_a_private_company. Examples of private companies found here: http://www.forbes.com/2008/11/03/largest-private-companies-biz-privates08-cx_sr_1103private_land.html - + - - + + @@ -2208,12 +2258,12 @@ We would like the range of core:outcome to be the union of Event and Process; an + + B.A. Bachelor of Arts This list may have multiple abbreviations for some degrees. An academic degree at any level, both as reported by individuals for employment and as offered by academic degree programs. - - @@ -2259,31 +2309,21 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - + + + + phonograph record; tape; CD; DVD; DAT An audio document; aka record. http://purl.org/ontology/bibo/ stable - Recorded audio in any format - - - - - - - - 1 - - http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49chgef.htm @@ -2305,6 +2345,21 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ + + + + + + + + 1 + + + + + + + FAO terminology @@ -2318,17 +2373,12 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ 2010-06-24 - - - - - http://purl.org/ontology/bibo/ film; video; Blu-ray Audiovisual recording in any format - + stable An audio-visual document; film, video, and so forth. @@ -2401,16 +2451,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - 1 - - @@ -2419,27 +2459,37 @@ We would like the range of core:outcome to be the union of Event and Process; an - A defined class of organizations that fund Grants. National Institute of Health (NIH) + - + Definition found here: http://dictionary.reference.com/browse/publisher A person or company whose business is the publishing of books, periodicals, engravings, computer software, etc. Elsevier; Harper & Row; Indiana University Press - + - - + + + + + + + + + + + 1 + @@ -2458,11 +2508,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Afghanistan; Antigua and Barbuda; Cameroon; Iceland; Jamaica; Nigeria; United States of America - - - - - @@ -2471,15 +2516,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - 1 - - - - - - + + @@ -2506,12 +2546,17 @@ We would like the range of core:outcome to be the union of Event and Process; an Uniform Resource Locator (URL) specifies where an identified resource is available and the mechanism for retrieving it. http://info.slis.indiana.edu/~katy/ - + - + - - + 1 + + + + + 1 + @@ -2531,11 +2576,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - @@ -2544,11 +2584,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable - - - - - http://www.fao.org/termportal/contr/ar/ @@ -2563,17 +2598,17 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + + + - - - - - Short Definition copied from bibo ontology @@ -2589,16 +2624,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Public Definition source (http://www.answers.com/topic/publisher). - - - 1 - - - - - - - An Institute normally has a research focus but may also fulfill instructional or outreach roles. @@ -2606,18 +2631,18 @@ We would like the range of core:outcome to be the union of Event and Process; an Institute for Fundamental Theory - - + + This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. Only use if no specific subclasses of foaf:organization desribe the organization. - - + A generic class encompassing several types of organizations. - - + + - + + Ued to describe an organization related to bibliographic items such as a publishing company, etc. @@ -2639,11 +2664,21 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + A Person holding an academic employment appointment focused on research rather than teaching; temporary (or for some defined term) + + + + + @@ -2652,26 +2687,16 @@ We would like the range of core:outcome to be the union of Event and Process; an definition modified from: source (http://en.wikipedia.org/wiki/Seating_capacity). 55 - - - + + - - - - 1 - + The digital file (or physical equivalent), if available after the conference, vs. the act of attending/presenting: use ConferencePresentation for information about date/time/location/name of the event where the poster was presented - - - 1 - - An organized series of workshop events, whether repetitions of the same workshop or multiple different workshops. Use workshop for individual events. @@ -2683,6 +2708,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + @@ -2695,29 +2725,29 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - + - Only use if no specific subclasses of event:Event are appropriate. - - + This class will also display instances of subclasses under Event, e.g. Philosophy Department Discussion Club; 2009 Racker Lecture; screening of a documentary. In addition to a location in space and time, an event may have any or all the following qualities: actively participating agents, passive factors, work products. Also, it may be in a virtual space or part of a series such as a lecture series. The previous short definition was: "An arbitrary classification of a space/time region, by a cognitive agent." - - - Something that happens at a given place and time. - - - + + + + + + Something that happens at a given place and time. + + + + - + - - + 1 + @@ -2727,11 +2757,6 @@ The previous short definition was: "An arbitrary classification of a space/time http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - - - - - http://www.fao.org/termportal/en/ @@ -2745,16 +2770,6 @@ The previous short definition was: "An arbitrary classification of a space/time http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - 1 - - - - - 1 - - @@ -2767,11 +2782,6 @@ The previous short definition was: "An arbitrary classification of a space/time - - - 1 - - A visual representation such as a photograph or graph @@ -2797,12 +2807,12 @@ The previous short definition was: "An arbitrary classification of a space/time - - + An award, honor, or distinction received by a person on a particular date (not the award itself as given repeatedly, and not a grant award). - + A specific award on a particular date or for a particular date range. + Ninth annual Wiley Prize in Biomedical Sciences, for the discovery of a light activated ion channel @@ -2821,10 +2831,10 @@ The previous short definition was: "An arbitrary classification of a space/time Draft legislation presented for discussion to a legal body. stable - + + + - - @@ -2833,33 +2843,18 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - - - - 1 - - Role of co-principal investigator of a grant, who devotes a specified percentage of time and is considered key personnel. - - - - - - Professor, associate professor and assistant professor are common positions for academic faculty. + Professor; Associate Professor; Assistant Professor Academic position in a university or institution + - @@ -2874,43 +2869,38 @@ The previous short definition was: "An arbitrary classification of a space/time The dual relationship of a professor advising a student and the student being advised by a professor, typically including start and end dates - + - + - 1 - + + - - - 1 - - - + - - + 1 + + + + + + An explicit individual academic term, quarter, or semester rather than the generic fall, spring or summer semester. - - - - - A form of qualitative descriptive research that is used to study individuals, a small group of participants, or a group as a whole. Medical usage (from MeSH): clinical presentations that may be followed by evaluative studies that eventually lead to a diagnosis. @@ -2927,26 +2917,16 @@ modern society using the world of Star trek. Los Angeles Times, March An section number - + + + - - - - - - - - - - - - http://www.fao.org/termportal/contr/en/ http://www.fao.org/termportal/contr/es/ @@ -2973,37 +2953,22 @@ modern society using the world of Star trek. Los Angeles Times, March An agent that interview another agent. - - - - - - + - - + + - + - - - - - - - - - - - - + 1 + @@ -3017,10 +2982,10 @@ modern society using the world of Star trek. Los Angeles Times, March a specific period or duration, defined by (optional) start and end date/times. - - + + - + @@ -3038,22 +3003,22 @@ modern society using the world of Star trek. Los Angeles Times, March Short Definition from bibo ontology + + + 1 + + + + + + + - - + + - - - - - - - - - - - + @@ -3081,17 +3046,17 @@ modern society using the world of Star trek. Los Angeles Times, March 2010-06-24 http://www.fao.org/termportal/contr/zh/ + + + 1 + + The value of the datatype property *validSince* associated to a particular area (territory or group) indicates the area's first year of validity. The geopolitical ontology traces back historic changes only until 1985, therefore, if an area has a validSince = 1985, this indicates that the area is/was valid since 1985 or before. - - - - - @@ -3104,10 +3069,10 @@ modern society using the world of Star trek. Los Angeles Times, March - + - - + + @@ -3165,10 +3130,10 @@ Examples of a Publisher include a person, an organization, or a service. Typical A presentation of a series of slides, usually presented in front of an audience with written text and images. stable - + - - + + @@ -3202,10 +3167,10 @@ Examples of a Publisher include a person, an organization, or a service. Typical http://purl.org/ontology/bibo/ - - + - + 1 + http://www.fao.org/termportal/contr/es/ @@ -3220,15 +3185,10 @@ Examples of a Publisher include a person, an organization, or a service. Typical 2010-06-24 - + - 1 - - - - - - + + @@ -3236,19 +3196,19 @@ Examples of a Publisher include a person, an organization, or a service. Typical Resource dependent on other entities This class is here so it can be equivalent to vitro:DependentResource. Deletion in the VIVO system behaves differently when deleting members of this class: related individuals may need to be deleted as well. + + + 1 + + A distinct, usually specialized educational unit within an educational organization. - - + + Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts) - - - - - @@ -3274,6 +3234,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/A passage selected from a larger work. http://purl.org/ontology/bibo/ + + + + + @@ -3283,28 +3248,38 @@ Definition source: http://isiwebofknowledge.com/researcherid/Critical or explanatory note for a Document. - + - - + 1 + - + + + - An intramural or extramural award to support scholarly work, such as UF09179 (VIVO) Short definition is from the Glossary of NIH Terms. - - - Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity + + + + + + + Written musical composition for voice or instruments or both + + + + + 2010-06-24 http://www.fao.org/termportal/contr/ar/ @@ -3327,21 +3302,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/A legal decision that reverses a ruling. http://purl.org/ontology/bibo/ - - - - - Information Science; Computer Science; Anthropology - + 1 - + This namespace - http://purl.org/dc/elements/1.1/ - does not appear to have this element. @@ -3372,6 +3342,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/2010-06-24 http://www.fao.org/termportal/en/ + + + 1 + + Universal Product Code @@ -3386,10 +3361,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + - + + @@ -3398,21 +3373,36 @@ Definition source: http://isiwebofknowledge.com/researcherid/Intel Talent Search; poetry contest Not the same as an award or distinction. - + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + 1 + + @@ -3427,12 +3417,22 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable + + + + + + + + 1 + + @@ -3449,10 +3449,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ 0.7 - + - - + + http://purl.org/ontology/bibo/ @@ -3467,18 +3467,23 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Address has properties for department name, street, city, state or province, postal code, and country. For US specific address, classify using core:US Postal Code. core:Address will display all addresses. - University of Waterloo, 200 University Avenue West, Waterloo, Ontario, Canada N2L 3G1 + A code and abstract concept expressing a location on the Earth's surface. To classify US specific addresses, use core:US Postal Code. + Librarian; Library Systems Analyst; Music Bibliographer It is the common position in libraries. + A position held by library and information science professionals, or academic or technical experts, in support of providing information services or materials - - + + + + 1 + http://www.fao.org/termportal/contr/zh/ @@ -3493,30 +3498,35 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/es/ - + + + - - - + + - - + - - - + + + - - - + + + + + + + + @@ -3525,6 +3535,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + http://purl.org/ontology/bibo/ stable @@ -3533,10 +3548,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/Library of Congress Control Number Source: http://en.wikipedia.org/wiki/Library_of_Congress_Control_Number. - + - 1 - + 1 + @@ -3545,10 +3560,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + - + 1 + @@ -3569,8 +3584,8 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A group of people organized for a specific purpose (e.g., a reporting or advisory role), often with a charge and for a specific duration. + There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important. - Short Definition from OCLC Input Standards, EntW @@ -3589,6 +3604,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/http://purl.org/ontology/bibo/ a document that states some contractual relationship or grants some right + + + + + @@ -3605,13 +3625,13 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + 1320 East 10th Street, Wells Library 021 Bloomington, IN 47405 - + Formal address in US postal address system. + US postal address follow the format street, apt or office number (optional), city, state, and zipcode. @@ -3621,15 +3641,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + - - - 1 - - @@ -3644,16 +3664,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print. - - - + Short Definition from the bibo ontology unstable A section of a book - + + http://purl.org/ontology/bibo/ + A section of a book. @@ -3667,10 +3687,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - 1 - + + + + + + + @@ -3686,11 +3711,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - radio or newspaper interview @@ -3700,6 +3720,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable + + + + + @@ -3714,11 +3739,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/The Getty Museum A building or place where works of art, scientific specimens, or other objects of permanent value are kept and displayed. - - - 1 - - unstable http://purl.org/ontology/bibo/ @@ -3727,6 +3747,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3752,6 +3777,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3762,6 +3792,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3787,10 +3822,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + + - 1 - + A small reference book, especially one giving instructions. @@ -3828,10 +3863,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ B.A. - + - 1 - + + + + + + + @@ -3850,6 +3890,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + + + + + + For example, National Science Foundation providesFundingThrough Graduate Research Fellowship Program; National Institutes of Health providesFundingThrough National Center for Research Resources. @@ -3883,11 +3933,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3915,11 +3960,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/Used for a single narrative summary of research, typically covering a wide range of activities and time periods; use Researcher Role for information on individual activities - - - - - A role involving research (funded or unfunded), sometimes linked to a grant @@ -3927,11 +3967,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Bacteria-resistant bandage; Termite prevention system; Hurricane resistant houses - - - - - Relates a document to some transcribed original. The bibo:transcriptOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers this term unstable. @@ -3995,11 +4030,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - FAO terminology @@ -4026,10 +4056,20 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/ar/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - + + + 1 + + + + + + 2 + + + + - - @@ -4063,11 +4103,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - @@ -4080,11 +4115,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - The concept name, URL, and source vocabulary name of a Subject Area. http://www.getty.edu/vow/AATHierarchy?find=&logic=AND&note=&english=N&subjectid=300000000 @@ -4113,6 +4143,11 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/en/ + + + + + @@ -4136,18 +4171,18 @@ bibo has the domain of this property set to the union of Collection and Document - - - + A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate + + Short Definition from the bibo ontology stable http://purl.org/ontology/bibo/ - - + + A document (noun) is a bounded physical representation of body of information designed with the capacity (and usually intent) to communicate. A document may manifest symbolic, diagrammatic or sensory-representational information. - A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate + @@ -4155,17 +4190,17 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + - - - - - FAO terminology 2010-06-24 @@ -4227,16 +4262,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi An edited book. - - http://purl.org/ontology/bibo/ - + + Best American Science Writing 2009 stable An edited collection of stand-alone articles published as a book + Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible. @@ -4245,15 +4280,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Short definition obtained here: http://en.wiktionary.org/wiki/geopolitical_entity. - + - - - - - - - + + @@ -4261,6 +4291,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + 100 Caldwell Hall; 114 Martha Van Rensselaer (Rushmore Conference Room) Room that provides a particular service or is used for a particular activity. @@ -4268,64 +4303,59 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Enter room number of name. - + + - - - - - - - + - + - - + + + + + + + - - - - - - - - - - - - - - - - - + - - - - - + + - - - - - + + + + - - + + + + + + + + + + + + + + + + + + - - - - - + + + + @@ -4333,25 +4363,15 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Medicine - - - - - - - - + + + - - + - - - - - 1 - + + http://www.fao.org/termportal/en/ @@ -4371,6 +4391,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Examples shows a book has French language version. Public description source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . + + + + + @@ -4378,6 +4403,26 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + 1 + + + + + + + + + + + + + + + + + http://www.fao.org/termportal/contr/fr/ @@ -4394,39 +4439,24 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi College of Arts & Sciences; Ivy Tech Community College - A primary academic unit within a University or a free-standing higher education organization without graduate degree programs. - - - - - - - - - - + Document1 isVersionOf Document2 This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - + - - + + - + - - - - - 1 - + @@ -4446,27 +4476,42 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://data.worldbank.org/indicator/NY.GDP.MKTP.CD + + + 1 + + - - - + + + - - - + + 1 + + + + + + - + + + + + + @@ -4496,36 +4541,21 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - - - - - - - 2 - - + - - - + + + - - - - - @@ -4537,23 +4567,18 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://xmlns.com/foaf/spec/#term_firstName. Note from foaf: "The lastName property is provided (alongside firstName) as a mechanism to support legacy data that cannot be easily interpreted in terms of the (otherwise preferred) familyName and givenName properties. The concepts of 'first' and 'last' names do not work well across cultural and linguistic boundaries; however they are widely used in addressbooks and databases." - - - 1 - - - - - - - - UITS service UITS service is the information technology services provided by Indiana University. SC. - + A regularly offered service in support of an academic, research, or administrative function (not personal or professional service by an individual) + + + + + + @@ -4561,23 +4586,13 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - - - - 1 - - - + - - + + @@ -4602,15 +4617,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - - - - - - 1 - + + @@ -4626,27 +4636,12 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - This is done with a restriction on agent. - - 1 - - - - - - - - Code of Federal Regulations @@ -4657,21 +4652,31 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi A work consisting of texts of rules and regulations related to statutes issued by executive or administrative agencies A collection of statutes. + + + + + An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support - - - + + + + + + + + + Used information from this definition: http://dictionary.reference.com/browse/library. A collection of any materials, for study and enjoyment, which has been systematically arranged. - Marston Science Library @@ -4688,30 +4693,20 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ - - + + - + - - + + - + - 1 - - - - - - - - - - - + + http://www.fao.org/termportal/contr/ar/ @@ -4744,19 +4739,29 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - - - + + + 1 + + + + + - - + + + - + + + + + @@ -4765,15 +4770,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi full email address - + - - - - - - 1 - + + @@ -4781,29 +4781,24 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - + - - + + Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. - - - - + + + + - + - + + + - - - - - - - @@ -4811,11 +4806,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Chicago; New York; Bloomington; Gainesville - - - - - @@ -4828,30 +4818,35 @@ We would like the range of core:outcome to be the union of Event and Process; an For data ingest from authoritative sources to record the actual way a person was listed as author, as potentially valuable information for author disambiguation. + + + 1 + + + + + + + + + + 1 + + + + + + + A person who has already received a bachelor's degree and is working toward a Master's or Doctoral degree. - - - - - - - - 1 - - - - - 1 - - @@ -4865,29 +4860,29 @@ We would like the range of core:outcome to be the union of Event and Process; an http://aims.fao.org/website/Search-AGROVOC/sub http://aims.fao.org/website/Search-AGROVOC/sub + + + + + Used to link a bibliographic item to one of its contributor: can be an author, an editor, a publisher, etc. - - + - + + - + - - + + - + - - - - - - - + + @@ -4906,11 +4901,26 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + Any organization (likely also asserted as another class of Organization) with a primary, ongoing research function, not just through occasional roles + + + 1 + + + + + + + @@ -4921,22 +4931,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - administrative secretary Definition http://en.wikipedia.org/wiki/Job_title#Job_title. - - - 1 - - @@ -4956,21 +4956,16 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - - - - - - + 1 + Medical Subject Heading (MeSH) definition of Technical Report: Work consisting of a formal report giving details of the investigation and results of a medical or other scientific problem. When issued by a government agency or comparable official body, its contents may be classified, unclassified, or declassified with regard to security clearance. This publication type may also cover a scientific paper or article that records the current state or current position of scientific research and development. If so labeled by the editor or publisher, this publication type may be properly used for journal articles. A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc.. - + http://purl.org/ontology/bibo/ A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc. @@ -4994,6 +4989,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/es/ FAO terminology + + + 1 + + 2010-06-24 http://www.fao.org/termportal/en/ @@ -5013,14 +5013,14 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - + + + - - - + + + + @@ -5037,15 +5037,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + + - - - + - - + 1 + @@ -5064,11 +5064,21 @@ We would like the range of core:outcome to be the union of Event and Process; an An organized series of a meeting for consultation or discussion. + + + 1 + + A person registered in an undergraduate program leading to a bachelor's degree or an undergraduate diploma or certificate. + + + 1 + + An excerpted collection of words @@ -5079,10 +5089,10 @@ We would like the range of core:outcome to be the union of Event and Process; an Short Definition from the bibo ontology - + + A position involving academic work but without faculty status Researcher; Academic Extension Associate; Postdoctoral Associate - Those positions are held by people who do academic work but do not have faculty positions in universities or institutes. @@ -5092,6 +5102,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + Currently being used by a restriction on organization. @@ -5104,11 +5119,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - The example is one outreach role required by US space agency NASA, which is related with one project in NASA. Name of the outreach role should be put here. @@ -5116,21 +5126,21 @@ We would like the range of core:outcome to be the union of Event and Process; an An outreach or community service role directed outside a person's primary profession and institution Communicating Astronomy to the Public - + - 1 - + + stable - A loose, thematic, collection of Documents, often Books. A thematic collection of documents, usually books, issued at regular or irregular intervals http://purl.org/ontology/bibo/ - + Methods in Molecular Biology + @@ -5138,6 +5148,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + Definition take from: http://dictionary.reference.com/browse/foundation. An institution financed by a donation or legacy to aid research, education, the arts, etc. @@ -5162,11 +5177,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik An identifier of serials, still in use by libraries, but replaced by ISSN for any new work stable - - - - - This is done with a restriction on agent. @@ -5179,6 +5189,16 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + 1 + + + + + + + @@ -5196,10 +5216,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Short Definition modified from the one found here: http://www.thefreedictionary.com/county. - + Alachua; Baker; Bradford; Kenora; Ottawa; Waterloo The largest administrative division of most states or provinces. + + + + + Home page for Scopus: http://www.scopus.com/home.url @@ -5223,44 +5248,34 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - - - - - - - + Short Definition from the bibo ontology - A distinct part of a larger document or collected document http://purl.org/ontology/bibo/ a distinct part of a larger document or collected document. - + unstable + - + + + - - - - + + Short Definition copied from bibo ontology - + http://purl.org/ontology/bibo/ - A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers. + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers stable @@ -5281,15 +5296,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + - - + + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. - An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. - @@ -5297,11 +5312,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - @@ -5313,10 +5323,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A URLLink that is designated (by the user or anyone else) as a primary link for the person, organization, event, etc. - - - + + + @@ -5369,10 +5379,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - - + + http://www.fao.org/termportal/contr/zh/ @@ -5392,11 +5402,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - @@ -5432,15 +5437,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/termportal/en/ 2010-06-24 - + - 1 - - - - - - + + @@ -5468,12 +5468,12 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + A list of items in a collection; an ordered compilation of item descriptions and sufficient information to afford access to them + NLM Catalog - Short Definition is the Medical Subject Heading (MeSH) definition - From 50345ec405eec04e38d7b50a64dcefdf9ac10c32 Mon Sep 17 00:00:00 2001 From: nac26 Date: Tue, 8 Feb 2011 13:05:10 +0000 Subject: [PATCH 366/427] Format change only. Indented first 3 elements of #intro --- themes/wilma/templates/page-home.ftl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl index 337fa840..c7dbf100 100644 --- a/themes/wilma/templates/page-home.ftl +++ b/themes/wilma/templates/page-home.ftl @@ -11,15 +11,15 @@ <#include "identity.ftl"> - + <#include "menu.ftl">
-

Welcome to VIVO

- -

VIVO is a research-focused discovery tool that enables collaboration among scientists across all disciplines.

-

Browse or search information on people, departments, courses, grants, and publications.

- +

Welcome to VIVO

+ +

VIVO is a research-focused discovery tool that enables collaboration among scientists across all disciplines.

+

Browse or search information on people, departments, courses, grants, and publications.

+

Search VIVO

From b8608ee92974d8ec2f8fca1789c0740a69912f2e Mon Sep 17 00:00:00 2001 From: sjm222 Date: Tue, 8 Feb 2011 14:55:36 +0000 Subject: [PATCH 367/427] Deleting these incomplete files for now so we don't risk shipping them with the release in the current state. I will check them back in when updated. --- .../optional/mapping/scirr-bfo-1.2.owl | 67 ----- .../mapping/scirr-ero-mapping-1.2.owl | 234 ------------------ .../optional/mapping/vivo-bfo-1.2.owl | 211 ---------------- 3 files changed, 512 deletions(-) delete mode 100644 productMods/WEB-INF/ontologies/optional/mapping/scirr-bfo-1.2.owl delete mode 100644 productMods/WEB-INF/ontologies/optional/mapping/scirr-ero-mapping-1.2.owl delete mode 100644 productMods/WEB-INF/ontologies/optional/mapping/vivo-bfo-1.2.owl diff --git a/productMods/WEB-INF/ontologies/optional/mapping/scirr-bfo-1.2.owl b/productMods/WEB-INF/ontologies/optional/mapping/scirr-bfo-1.2.owl deleted file mode 100644 index 8ffcfecf..00000000 --- a/productMods/WEB-INF/ontologies/optional/mapping/scirr-bfo-1.2.owl +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/productMods/WEB-INF/ontologies/optional/mapping/scirr-ero-mapping-1.2.owl b/productMods/WEB-INF/ontologies/optional/mapping/scirr-ero-mapping-1.2.owl deleted file mode 100644 index 9992ae8c..00000000 --- a/productMods/WEB-INF/ontologies/optional/mapping/scirr-ero-mapping-1.2.owl +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/productMods/WEB-INF/ontologies/optional/mapping/vivo-bfo-1.2.owl b/productMods/WEB-INF/ontologies/optional/mapping/vivo-bfo-1.2.owl deleted file mode 100644 index 337d1879..00000000 --- a/productMods/WEB-INF/ontologies/optional/mapping/vivo-bfo-1.2.owl +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 3824aa0c46899e1f4be3f006d2bf75289b49b49e Mon Sep 17 00:00:00 2001 From: cdtank Date: Tue, 8 Feb 2011 15:03:52 +0000 Subject: [PATCH 368/427] 1. Adding the license info. --- .../entitycomparison/EntityComparisonUtilityFunctions.java | 1 + .../entitygrantcount/EntityGrantCountRequestHandler.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java index b91b2861..494a9f3e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java @@ -1,3 +1,4 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; import java.util.HashMap; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java index 37d68651..63e74d82 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java @@ -29,7 +29,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.Visu import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.EntityComparisonUtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.EntitySubOrganizationTypesQueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; From 3bd2140613cf169d1b3fce9ed7dbfb1ef26d869f Mon Sep 17 00:00:00 2001 From: hlm7 Date: Tue, 8 Feb 2011 18:20:05 +0000 Subject: [PATCH 369/427] Holly did some final tweaking of the test cases. --- .../suites/CheckVisualizations/Suite.html | 1 + .../suites/CheckVisualizationsVB/Suite.html | 1 + .../DeleteEducationalBackground.html | 4 ++-- .../DeleteEducationalBackground.html | 2 +- .../suites/CustomPositionsForm/DeletePositions.html | 11 ++++++++--- .../CustomPositionsForm/DeleteTestFacultyMember.html | 2 +- .../suites/CustomPositionsFormVB/DeletePositions.html | 11 ++++++++--- .../DeleteTestFacultyMember.html | 2 +- 8 files changed, 23 insertions(+), 11 deletions(-) diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/Suite.html b/utilities/acceptance-tests/suites/CheckVisualizations/Suite.html index 0cb53fcb..3cadf6c0 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/Suite.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/Suite.html @@ -14,6 +14,7 @@ AddCoAuthors AddGrants AddCoInvestigators +TestTemporalGraphs CheckGrantDates DeleteTestFaculty DeleteTestCos diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/Suite.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/Suite.html index 0cb53fcb..3cadf6c0 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/Suite.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/Suite.html @@ -14,6 +14,7 @@ AddCoAuthors AddGrants AddCoInvestigators +TestTemporalGraphs CheckGrantDates DeleteTestFaculty DeleteTestCos diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html index 10dbb3d3..fbd2e76d 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html @@ -306,7 +306,7 @@ assertTitle - Search for 'carroll college' + carroll college - VIVO Search Results @@ -391,7 +391,7 @@ assertTitle - Search for 'wisconsin' + wisconsin - VIVO Search Results diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html index 5561c159..fbd2e76d 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html @@ -306,7 +306,7 @@ assertTitle - Search for 'carroll college' + carroll college - VIVO Search Results diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html index e186a967..a6cb8e38 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html @@ -34,6 +34,11 @@ Delete all positions setup for test faculty member + + setTimeout + 200000 + + deleteAllVisibleCookies @@ -241,7 +246,7 @@ waitForPageToLoad - 5000 + 10000 @@ -306,7 +311,7 @@ waitForPageToLoad - 5000 + 10000 @@ -371,7 +376,7 @@ waitForPageToLoad - 5000 + 10000 diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html index 6166207d..f1c6efb5 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html @@ -151,7 +151,7 @@ waitForPageToLoad - 5000 + 10000 diff --git a/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeletePositions.html b/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeletePositions.html index e186a967..b4a8bc76 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeletePositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeletePositions.html @@ -34,6 +34,11 @@ Delete all positions setup for test faculty member + + setTimeout + 200000 + + deleteAllVisibleCookies @@ -241,7 +246,7 @@ waitForPageToLoad - 5000 + 20000 @@ -306,7 +311,7 @@ waitForPageToLoad - 5000 + 20000 @@ -371,7 +376,7 @@ waitForPageToLoad - 5000 + 20000 diff --git a/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeleteTestFacultyMember.html index 6166207d..f1c6efb5 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeleteTestFacultyMember.html +++ b/utilities/acceptance-tests/suites/CustomPositionsFormVB/DeleteTestFacultyMember.html @@ -151,7 +151,7 @@ waitForPageToLoad - 5000 + 10000 From 941c4429832ea81fc184e3c717d117f194240190 Mon Sep 17 00:00:00 2001 From: sjm222 Date: Tue, 8 Feb 2011 19:28:44 +0000 Subject: [PATCH 370/427] NIHVIVO-2067 (part of it) don't manufacture new core:dateTimeIntervalFor assertions during the migration. --- .../ontologies/update/sparqlConstructs/additions/endDate.sparql | 1 - .../ontologies/update/sparqlConstructs/additions/endYear.sparql | 1 - .../update/sparqlConstructs/additions/startAndEndDate.sparql | 1 - .../update/sparqlConstructs/additions/startAndEndYear.sparql | 1 - .../update/sparqlConstructs/additions/startDate.sparql | 1 - .../update/sparqlConstructs/additions/startYear.sparql | 1 - 6 files changed, 6 deletions(-) diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/endDate.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/endDate.sparql index 24fe0ece..fe8b28b2 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/endDate.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/endDate.sparql @@ -20,7 +20,6 @@ Construct { _:dti a core:DateTimeInterval . _:dti core:end _:edtv . ?thing core:dateTimeInterval _:dti . - _:dti core:dateTimeIntervalFor ?thing . } where { ?thing core:endDate ?theEndDate . diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/endYear.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/endYear.sparql index eb68f672..29d1086a 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/endYear.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/endYear.sparql @@ -20,7 +20,6 @@ Construct { ?thing core:dateTimeInterval _:dti . _:dti a core:DateTimeInterval . _:dti core:end _:edtv . - _:dti core:dateTimeIntervalFor ?thing . } where { ?thing core:endYear ?theEndYear . diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startAndEndDate.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startAndEndDate.sparql index e8b31fcc..10ac6d95 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startAndEndDate.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startAndEndDate.sparql @@ -24,7 +24,6 @@ Construct { _:dti core:start _:sdtv . _:dti core:end _:edtv . ?thing core:dateTimeInterval _:dti . - _:dti core:dateTimeIntervalFor ?thing . } where { ?thing core:startDate ?theStartDate . ?thing core:endDate ?theEndDate . diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startAndEndYear.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startAndEndYear.sparql index 44949d93..0dae4f95 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startAndEndYear.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startAndEndYear.sparql @@ -24,7 +24,6 @@ Construct { _:dti core:start _:sdtv . _:dti core:end _:edtv . ?thing core:dateTimeInterval _:dti . - _:dti core:dateTimeIntervalFor ?thing . } where { ?thing core:startYear ?theStartYear . ?thing core:endYear ?theEndYear . diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startDate.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startDate.sparql index 6b87e4b2..f2aa23e7 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startDate.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startDate.sparql @@ -20,7 +20,6 @@ Construct { _:dti a core:DateTimeInterval . _:dti core:start _:sdtv . ?thing core:dateTimeInterval _:dti . - _:dti core:dateTimeIntervalFor ?thing . } where { ?thing core:startDate ?theStartDate . diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startYear.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startYear.sparql index e734a375..5e65ca78 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startYear.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/startYear.sparql @@ -20,7 +20,6 @@ Construct { _:dti a core:DateTimeInterval . _:dti core:start _:sdtv . ?thing core:dateTimeInterval _:dti . - _:dti core:dateTimeIntervalFor ?thing . } where { ?thing core:startYear ?theStartYear . From 4f7d3b83029c191ca8419991e0e3eb46755b7b50 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Tue, 8 Feb 2011 21:07:18 +0000 Subject: [PATCH 371/427] NIHVIVO-2071 Include pageSetup.ftl in every page template. Use to generate a body class value, and apply to body element in page templates. --- themes/vivo-basic/templates/page-home.ftl | 2 +- themes/vivo-basic/templates/page.ftl | 2 +- themes/wilma/templates/page-home.ftl | 2 +- themes/wilma/templates/page.ftl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/vivo-basic/templates/page-home.ftl b/themes/vivo-basic/templates/page-home.ftl index 5f1f2e82..f03d706b 100644 --- a/themes/vivo-basic/templates/page-home.ftl +++ b/themes/vivo-basic/templates/page-home.ftl @@ -8,7 +8,7 @@ <#include "head.ftl"> - + <#include "identity.ftl"> <#include "menu.ftl"> diff --git a/themes/vivo-basic/templates/page.ftl b/themes/vivo-basic/templates/page.ftl index 8f6e9857..cdfc450e 100644 --- a/themes/vivo-basic/templates/page.ftl +++ b/themes/vivo-basic/templates/page.ftl @@ -8,7 +8,7 @@ <#include "head.ftl"> - + <#include "identity.ftl"> <#include "menu.ftl"> diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl index c7dbf100..d3591271 100644 --- a/themes/wilma/templates/page-home.ftl +++ b/themes/wilma/templates/page-home.ftl @@ -9,7 +9,7 @@ <#include "head.ftl"> - + <#include "identity.ftl"> <#include "menu.ftl"> diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl index 8f6e9857..cdfc450e 100644 --- a/themes/wilma/templates/page.ftl +++ b/themes/wilma/templates/page.ftl @@ -8,7 +8,7 @@ <#include "head.ftl"> - + <#include "identity.ftl"> <#include "menu.ftl"> From c2a0816ec1ce373f7beb01e9c66419ab81e1b19b Mon Sep 17 00:00:00 2001 From: cdtank Date: Tue, 8 Feb 2011 21:22:55 +0000 Subject: [PATCH 372/427] 1. Refactored the vis code geenrators for publication, coauthor, coinvestigator, grants sparklines to remove unused code. 2. Changed logic to not to generate link to csv downloads if there is 0 publication/grant for an individual. --- .../coAuthorshipSparklineContent.ftl | 6 +- .../copi/coInvestigationSparklineContent.ftl | 5 +- .../grant/personGrantSparklineContent.ftl | 7 +- .../personPublicationSparklineContent.ftl | 7 +- .../CoAuthorshipVisCodeGenerator.java | 435 ++--------------- .../CoPIVisCodeGenerator.java | 419 ++-------------- .../PersonGrantCountVisCodeGenerator.java | 432 ++-------------- ...ersonPublicationCountVisCodeGenerator.java | 460 ++---------------- .../valueobjects/SparklineData.java | 53 -- .../freemarker/visutils/UtilityFunctions.java | 52 +- 10 files changed, 189 insertions(+), 1687 deletions(-) diff --git a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl index 170c739b..868e05f6 100644 --- a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl +++ b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl @@ -187,9 +187,11 @@ if (totalPubs !== totalPublicationCount) { sparksText += ' (' + totalPublicationCount + ' total)'; } + + if (totalPublicationCount) { + sparksText += '
(.CSV File) '; + } - sparksText += '
(.CSV File) '; - if (!onlyUnknownYearPublications) { diff --git a/productMods/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl b/productMods/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl index 032a9a4e..dfdb7d17 100644 --- a/productMods/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl +++ b/productMods/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl @@ -189,7 +189,10 @@ sparksText += ' (' + totalGrantCount + ' total)'; } - sparksText += '
(.CSV File) '; + if (totalGrantCount) { + sparksText += '
(.CSV File) '; + } + if (!onlyUnknownYearGrants) { diff --git a/productMods/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl b/productMods/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl index 8eabd918..b71230ad 100644 --- a/productMods/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl +++ b/productMods/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl @@ -188,10 +188,11 @@ if (totalGrants !== totalGrantCount) { sparksText += ' (' + totalGrantCount + ' total)'; } - + + if (totalGrantCount) { + sparksText += '
(.CSV File) '; + } - sparksText += '
(.CSV File) '; - if (!onlyUnknownYearGrants) { diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl b/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl index 01f413ed..e5303fca 100644 --- a/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl +++ b/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl @@ -189,8 +189,11 @@ if (totalPubs !== totalPublicationCount) { sparksText += ' (' + totalPublicationCount + ' total)'; } - - sparksText += '
(.CSV File) '; + + if (totalPublicationCount) { + sparksText += '
(.CSV File) '; + } + if (!onlyUnknownYearPublications) { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java index df04ace4..3abf27fa 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java @@ -11,21 +11,18 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import java.util.Map.Entry; import org.apache.commons.logging.Log; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Node; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -@SuppressWarnings("serial") public class CoAuthorshipVisCodeGenerator { /* @@ -37,22 +34,13 @@ public class CoAuthorshipVisCodeGenerator { * spanning the career of the person & last 10 years at the minimum, in case if * the person started his career in the last 10 yeras. * */ - private static final Map VIS_DIV_NAMES = new HashMap() { { - - put("SHORT_SPARK", "unique_coauthors_short_sparkline_vis"); - put("FULL_SPARK", "unique_coauthors_full_sparkline_vis"); - - } }; - - private static final String VISUALIZATION_STYLE_CLASS = "sparkline_style"; - private static final String DEFAULT_VISCONTAINER_DIV_ID = "unique_coauthors_vis_container"; private Map> yearToUniqueCoauthors; private Log log; - private SparklineData sparklineData; + private SparklineData sparklineParameterVO; private String individualURI; @@ -65,36 +53,22 @@ public class CoAuthorshipVisCodeGenerator { this.individualURI = individualURI; this.yearToUniqueCoauthors = yearToUniqueCoauthors; - this.sparklineData = new SparklineData(); this.log = log; - generateVisualizationCode(visMode, visContainer); + this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer); } /** - * This method is used to generate the visualization code (HMTL, CSS & JavaScript). - * There 2 parts to it - 1. Actual Content Code & 2. Context Code. - * 1. Actual Content code in this case is the sparkline image, text related to - * data and the wrapping tables. This is generated via call to google vis API through - * JavaScript. - * 2. Context code is generally optional but contains code pertaining to tabulated - * data & links to download files etc. + * This method is used to setup parameters for the sparkline value object. These parameters + * will be used in the template to construct the actual html/javascript code. * @param visMode * @param visContainer */ - private void generateVisualizationCode(String visMode, - String visContainer) { - - sparklineData.setSparklineContent(getMainVisualizationCode(visMode, - visContainer)); - - sparklineData.setSparklineContext(getVisualizationContextCode(visMode)); - - } - - private String getMainVisualizationCode(String visMode, + private SparklineData setupSparklineParameters(String visMode, String providedVisContainerID) { + + SparklineData sparklineData = new SparklineData(); int numOfYearsToBeRendered = 0; int currentYear = Calendar.getInstance().get(Calendar.YEAR); @@ -118,8 +92,6 @@ public class CoAuthorshipVisCodeGenerator { String visContainerID = null; - StringBuilder visualizationCode = new StringBuilder(); - if (yearToUniqueCoauthors.size() > 0) { try { minPublishedYear = Integer.parseInt(Collections.min(publishedYears)); @@ -150,30 +122,6 @@ public class CoAuthorshipVisCodeGenerator { sparklineData.setNumOfYearsToBeRendered(numOfYearsToBeRendered); - visualizationCode.append("\n"); - - visualizationCode.append("\n"; - } - - private String getVisualizationContextCode(String visMode) { - - String visualizationContextCode = ""; - if (VisualizationFrameworkConstants.SHORT_SPARKLINE_VIS_MODE.equalsIgnoreCase(visMode)) { - visualizationContextCode = generateShortVisContext(); - } else { - visualizationContextCode = generateFullVisContext(); - } - - log.debug(visualizationContextCode); - - return visualizationContextCode; - } - - private String generateFullVisContext() { - - StringBuilder divContextCode = new StringBuilder(); - - String csvDownloadURLHref = ""; - if (yearToUniqueCoauthors.size() > 0) { - if (getCSVDownloadURL() != null) { - - csvDownloadURLHref = "Download data as .csv file.
"; - sparklineData.setDownloadDataLink(getCSVDownloadURL()); - - } else { - csvDownloadURLHref = ""; - } - - } else { - csvDownloadURLHref = "No data available to export.
"; - } - - String tableCode = generateDataTable(); - - divContextCode.append("

" + tableCode + csvDownloadURLHref + "

"); - - sparklineData.setTable(tableCode); - - - Map yearToUniqueCoauthorsCount = new HashMap(); - for (Map.Entry> currentYear : yearToUniqueCoauthors.entrySet()) { - yearToUniqueCoauthorsCount.put(currentYear.getKey(), currentYear.getValue().size()); - } - - sparklineData.setYearToActivityCount(yearToUniqueCoauthorsCount); - - return divContextCode.toString(); - } - - private String getCSVDownloadURL(){ - - if (yearToUniqueCoauthors.size() > 0) { - - ParamMap CSVDownloadURLParams = new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, - individualURI, - VisualizationFrameworkConstants.VIS_TYPE_KEY, - VisualizationFrameworkConstants.COAUTHORSHIP_VIS, - VisualizationFrameworkConstants.VIS_MODE_KEY, - VisualizationFrameworkConstants.COAUTHORS_COUNT_PER_YEAR_VIS_MODE); - - return UrlBuilder.getUrl(VisualizationFrameworkConstants.DATA_VISUALIZATION_SERVICE_URL_PREFIX, - CSVDownloadURLParams); - - } else { - return null; - } - } - - private String generateShortVisContext() { - - StringBuilder divContextCode = new StringBuilder(); - - String fullTimelineLink; - if (yearToUniqueCoauthors.size() > 0) { - - ParamMap fullTimelineNetworkURLParams = new ParamMap( - VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, - individualURI, - VisualizationFrameworkConstants.VIS_TYPE_KEY, + sparklineData.setFullTimelineNetworkLink(UtilityFunctions.getCollaboratorshipNetworkLink(individualURI, VisualizationFrameworkConstants.PERSON_LEVEL_VIS, - VisualizationFrameworkConstants.VIS_MODE_KEY, - VisualizationFrameworkConstants.COAUTHOR_VIS_MODE); - - String fullTimelineNetworkURL = UrlBuilder.getUrl( - VisualizationFrameworkConstants.FREEMARKERIZED_VISUALIZATION_URL_PREFIX, - fullTimelineNetworkURLParams); - - fullTimelineLink = "View full timeline and co-author network."; + VisualizationFrameworkConstants.COAUTHOR_VIS_MODE)); - sparklineData.setFullTimelineNetworkLink(fullTimelineNetworkURL); + sparklineData.setDownloadDataLink(UtilityFunctions + .getCSVDownloadURL( + individualURI, + VisualizationFrameworkConstants.COAUTHORSHIP_VIS, + VisualizationFrameworkConstants.COAUTHORS_COUNT_PER_YEAR_VIS_MODE)); - } else { - fullTimelineLink = "No data available to render full timeline.
"; + Map yearToUniqueCoauthorsCount = new HashMap(); + + for (Map.Entry> currentYearToCoAuthors : yearToUniqueCoauthors.entrySet()) { + yearToUniqueCoauthorsCount.put(currentYearToCoAuthors.getKey(), + currentYearToCoAuthors.getValue().size()); + } + + sparklineData.setYearToActivityCount(yearToUniqueCoauthorsCount); } - divContextCode.append("

" + fullTimelineLink + "

"); - - return divContextCode.toString(); - } - - - private String generateDataTable() { - - StringBuilder dataTable = new StringBuilder(); - - dataTable.append("" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + ""); - - for (Entry> currentEntry : yearToUniqueCoauthors.entrySet()) { - dataTable.append("" - + "" - + "" - + ""); - } - - dataTable.append("\n
Unique Co-Authors per year
YearCount
" + currentEntry.getKey() + "" + currentEntry.getValue().size() + "
\n"); - - return dataTable.toString(); - } - - public SparklineData getValueObjectContainer() { return sparklineData; } -} + + public SparklineData getValueObjectContainer() { + return this.sparklineParameterVO; + } +} \ No newline at end of file diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIVisCodeGenerator.java index bc88321c..6a5867d5 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIVisCodeGenerator.java @@ -9,20 +9,18 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Set; import org.apache.commons.logging.Log; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.CoPINode; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; /** * This class contains code for rendering sparklines and displaying tables for @@ -30,7 +28,6 @@ import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Ye * @author bkoniden * Deepak Konidena */ -@SuppressWarnings("serial") public class CoPIVisCodeGenerator { /* @@ -42,22 +39,13 @@ public class CoPIVisCodeGenerator { * spanning the career of the person & last 10 years at the minimum, in case if * the person started his career in the last 10 years. * */ - private static final Map VIS_DIV_NAMES = new HashMap() { { - - put("SHORT_SPARK", "unique_copis_short_sparkline_vis"); - put("FULL_SPARK", "unique_copis_full_sparkline_vis"); - - } }; - - private static final String VISUALIZATION_STYLE_CLASS = "sparkline_style"; - private static final String DEFAULT_VISCONTAINER_DIV_ID = "unique_coinvestigators_vis_container"; private Map> yearToUniqueCoPIs; private Log log; - private SparklineData sparklineData; + private SparklineData sparklineParameterVO; private String individualURI; @@ -70,37 +58,23 @@ public class CoPIVisCodeGenerator { this.individualURI = individualURI; this.yearToUniqueCoPIs = yearToUniqueCoPIs; - this.sparklineData = new SparklineData(); - + this.log = log; - generateVisualizationCode(visMode, visContainer); + this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer); } /** - * This method is used to generate the visualization code (HMTL, CSS & - * JavaScript). There 2 parts to it - 1. Actual Content Code & 2. Context - * Code. 1. Actual Content code in this case is the sparkline image, text - * related to data and the wrapping tables. This is generated via call to - * google vis API through JavaScript. 2. Context code is generally optional - * but contains code pertaining to tabulated data & links to download files - * etc. - * + * This method is used to setup parameters for the sparkline value object. These parameters + * will be used in the template to construct the actual html/javascript code. * @param visMode * @param visContainer */ - private void generateVisualizationCode(String visMode, String visContainer) { + private SparklineData setupSparklineParameters(String visMode, + String providedVisContainerID) { - sparklineData.setSparklineContent(getMainVisualizationCode(visMode, - visContainer)); - - sparklineData.setSparklineContext(getVisualizationContextCode(visMode)); - - } - - private String getMainVisualizationCode(String visMode, - String providedVisContainerID) { + SparklineData sparklineData = new SparklineData(); int numOfYearsToBeRendered = 0; int currentYear = Calendar.getInstance().get(Calendar.YEAR); @@ -126,8 +100,6 @@ public class CoPIVisCodeGenerator { String visContainerID = null; - StringBuilder visualizationCode = new StringBuilder(); - if (yearToUniqueCoPIs.size() > 0) { try { minGrantYear = Integer.parseInt(Collections @@ -160,24 +132,6 @@ public class CoPIVisCodeGenerator { sparklineData.setNumOfYearsToBeRendered(numOfYearsToBeRendered); - visualizationCode.append("\n"); - - visualizationCode - .append("\n"; - } - - private String getVisualizationContextCode(String visMode) { - - String visualizationContextCode = ""; - if (VisualizationFrameworkConstants.SHORT_SPARKLINE_VIS_MODE.equalsIgnoreCase(visMode)) { - visualizationContextCode = generateShortVisContext(); - } else { - visualizationContextCode = generateFullVisContext(); - } - - log.debug(visualizationContextCode); - - return visualizationContextCode; - } - - private String generateFullVisContext() { - - StringBuilder divContextCode = new StringBuilder(); - - String csvDownloadURLHref = ""; if (yearToUniqueCoPIs.size() > 0) { - if (getCSVDownloadURL() != null) { - - csvDownloadURLHref = "Download data as .csv file.
"; - sparklineData.setDownloadDataLink(getCSVDownloadURL()); - - } else { - csvDownloadURLHref = ""; - } - - } else { - csvDownloadURLHref = "No data available to export.
"; - } - - String tableCode = generateDataTable(); - - divContextCode.append("

" + tableCode + csvDownloadURLHref + "

"); - - sparklineData.setTable(tableCode); - - Map yearToUniqueCoPIsCount = new HashMap(); - for (Map.Entry> currentYear : yearToUniqueCoPIs.entrySet()) { - yearToUniqueCoPIsCount.put(currentYear.getKey(), currentYear.getValue().size()); - } - - sparklineData.setYearToActivityCount(yearToUniqueCoPIsCount); - - return divContextCode.toString(); - } - - private String getCSVDownloadURL() { - - if (yearToUniqueCoPIs.size() > 0) { - - ParamMap CSVDownloadURLParams = new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, - individualURI, - VisualizationFrameworkConstants.VIS_TYPE_KEY, - VisualizationFrameworkConstants.CO_PI_VIS, - VisualizationFrameworkConstants.VIS_MODE_KEY, - VisualizationFrameworkConstants.COPIS_COUNT_PER_YEAR_VIS_MODE); - - return UrlBuilder.getUrl(VisualizationFrameworkConstants.DATA_VISUALIZATION_SERVICE_URL_PREFIX, - CSVDownloadURLParams); - - } else { - return null; - } - } - private String generateShortVisContext() { - - StringBuilder divContextCode = new StringBuilder(); - - String fullTimelineLink; - if (yearToUniqueCoPIs.size() > 0) { - - ParamMap fullTimelineNetworkURLParams = new ParamMap( - VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, - individualURI, - VisualizationFrameworkConstants.VIS_TYPE_KEY, + sparklineData.setFullTimelineNetworkLink(UtilityFunctions.getCollaboratorshipNetworkLink(individualURI, VisualizationFrameworkConstants.PERSON_LEVEL_VIS, - VisualizationFrameworkConstants.VIS_MODE_KEY, - VisualizationFrameworkConstants.COPI_VIS_MODE); + VisualizationFrameworkConstants.COPI_VIS_MODE)); + + sparklineData.setDownloadDataLink(UtilityFunctions + .getCSVDownloadURL( + individualURI, + VisualizationFrameworkConstants.CO_PI_VIS, + VisualizationFrameworkConstants.COPIS_COUNT_PER_YEAR_VIS_MODE)); + + Map yearToUniqueCoPIsCount = new HashMap(); + for (Map.Entry> currentYearToUniqueCoPIsCount : yearToUniqueCoPIs.entrySet()) { + yearToUniqueCoPIsCount.put(currentYearToUniqueCoPIsCount.getKey(), + currentYearToUniqueCoPIsCount.getValue().size()); + } - String fullTimelineNetworkURL = UrlBuilder.getUrl( - VisualizationFrameworkConstants.FREEMARKERIZED_VISUALIZATION_URL_PREFIX, - fullTimelineNetworkURLParams); + sparklineData.setYearToActivityCount(yearToUniqueCoPIsCount); - fullTimelineLink = "View full timeline and co-pi network."; - - sparklineData.setFullTimelineNetworkLink(fullTimelineNetworkURL); - - } else { - fullTimelineLink = "No data available to render full timeline.
"; } - - divContextCode.append("

" + fullTimelineLink + "

"); - - return divContextCode.toString(); - } - - private String generateDataTable() { - - StringBuilder dataTable = new StringBuilder(); - - dataTable.append("" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + ""); - - for (Entry> currentEntry : yearToUniqueCoPIs.entrySet()) { - dataTable.append("" - + "" - + "" - + ""); - } - - dataTable.append("\n
Unique Co-PIs per year
YearCount
" + currentEntry.getKey() + "" + currentEntry.getValue().size() + "
\n"); - - return dataTable.toString(); - } - - public SparklineData getValueObjectContainer() { + return sparklineData; } + + public SparklineData getValueObjectContainer() { + return this.sparklineParameterVO; + } } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java index 77a0bc44..9736b5a8 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java @@ -5,27 +5,23 @@ package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.persongrantcou import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Set; import org.apache.commons.logging.Log; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Grant; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -@SuppressWarnings("serial") public class PersonGrantCountVisCodeGenerator { /* @@ -38,22 +34,13 @@ public class PersonGrantCountVisCodeGenerator { * the person started his career in the last 10 yeras. * */ - private static final Map VIS_DIV_NAMES = new HashMap() { { - - put("SHORT_SPARK", "grant_count_short_sparkline_vis"); - put("FULL_SPARK", "grant_count_full_sparkline_vis"); - - } }; - - private static final String VISUALIZATION_STYLE_CLASS = "sparkline_style"; - private static final String DEFAULT_VIS_CONTAINER_DIV_ID = "grant_count_vis_container"; private Map yearToGrantCount; private Log log; - private SparklineData sparklineData; + private SparklineData sparklineParameterVO; private String individualURI; @@ -65,43 +52,28 @@ public class PersonGrantCountVisCodeGenerator { this.individualURI = individualURIParam; this.yearToGrantCount = yearToGrantCount; - this.sparklineData = new SparklineData(); - - sparklineData.setYearToActivityCount(yearToGrantCount); - + this.log = log; + + this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer, piGrants); - generateVisualizationCode(visMode, visContainer, piGrants); } /** - * This method is used to generate the visualization code (HMTL, CSS & JavaScript). - * There 2 parts to it - 1. Actual Content Code & 2. Context Code. - * 1. Actual Content code in this case is the sparkline image, text related to - * data and the wrapping tables. This is generated via call to google vis API through - * JavaScript. - * 2. Context code is generally optional but contains code pertaining to tabulated - * data & links to download files etc. + * This method is used to setup parameters for the sparkline value object. These parameters + * will be used in the template to construct the actual html/javascript code. * @param visMode * @param visContainer - * @param piGrants + * @param authorDocuments + * @return */ - private void generateVisualizationCode(String visMode, - String visContainer, + private SparklineData setupSparklineParameters(String visMode, + String providedVisContainerID, Set piGrants) { - sparklineData.setSparklineContent(getMainVisualizationCode(piGrants, - visMode, - visContainer)); - - - sparklineData.setSparklineContext(getVisualizationContextCode(visMode)); - - } - - private String getMainVisualizationCode(Set piGrants, - String visMode, String providedVisContainerID) { - + SparklineData sparklineData = new SparklineData(); + sparklineData.setYearToActivityCount(yearToGrantCount); + int numOfYearsToBeRendered = 0; int currentYear = Calendar.getInstance().get(Calendar.YEAR); int shortSparkMinYear = currentYear @@ -112,8 +84,7 @@ public class PersonGrantCountVisCodeGenerator { * the vis was rendered we dont want to be influenced by the * "DEFAULT_GRANT_YEAR". */ - Set grantYears = new HashSet(yearToGrantCount - .keySet()); + Set grantYears = new HashSet(yearToGrantCount.keySet()); grantYears.remove(VOConstants.DEFAULT_GRANT_YEAR); /* @@ -126,8 +97,6 @@ public class PersonGrantCountVisCodeGenerator { String visContainerID = null; - StringBuilder visualizationCode = new StringBuilder(); - if (yearToGrantCount.size() > 0) { try { minGrantYear = Integer.parseInt(Collections @@ -160,26 +129,6 @@ public class PersonGrantCountVisCodeGenerator { sparklineData.setNumOfYearsToBeRendered(numOfYearsToBeRendered); - visualizationCode.append("\n"); - - visualizationCode.append("\n"; - } - - - private String getVisualizationContextCode(String visMode) { - - String visualizationContextCode = ""; - if (VisualizationFrameworkConstants.SHORT_SPARKLINE_VIS_MODE.equalsIgnoreCase(visMode)) { - visualizationContextCode = generateShortVisContext(); - } else { - visualizationContextCode = generateFullVisContext(); } - log.debug(visualizationContextCode); - - return visualizationContextCode; - } - - private String generateFullVisContext() { - - StringBuilder divContextCode = new StringBuilder(); - - String csvDownloadURLHref = ""; - if (yearToGrantCount.size() > 0) { - if (getCSVDownloadURL() != null) { - - csvDownloadURLHref = "Download data as .csv file.
"; - sparklineData.setDownloadDataLink(getCSVDownloadURL()); - - } else { - csvDownloadURLHref = ""; - } - } else { - csvDownloadURLHref = "No data available to export.
"; + sparklineData.setFullTimelineNetworkLink(UtilityFunctions.getCollaboratorshipNetworkLink(individualURI, + VisualizationFrameworkConstants.PERSON_LEVEL_VIS, + VisualizationFrameworkConstants.COPI_VIS_MODE)); + + sparklineData.setDownloadDataLink(UtilityFunctions + .getCSVDownloadURL( + individualURI, + VisualizationFrameworkConstants.PERSON_GRANT_COUNT_VIS, + "")); + } - String tableCode = generateDataTable(); - - divContextCode.append("

" + tableCode + csvDownloadURLHref + "

"); - - sparklineData.setTable(tableCode); - - return divContextCode.toString(); - } - - - private String getCSVDownloadURL() { - - if (yearToGrantCount.size() > 0) { - - ParamMap CSVDownloadURLParams = new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, - individualURI, - VisualizationFrameworkConstants.VIS_TYPE_KEY, - VisualizationFrameworkConstants.PERSON_GRANT_COUNT_VIS); - - return UrlBuilder.getUrl(VisualizationFrameworkConstants.DATA_VISUALIZATION_SERVICE_URL_PREFIX, - CSVDownloadURLParams); - - } else { - return null; - } - } - - - private String generateShortVisContext() { - - StringBuilder divContextCode = new StringBuilder(); - - String fullTimelineLink; - if (yearToGrantCount.size() > 0) { - - // add another parameter for vis_mode - ParamMap fullTimelineNetworkURLParams = new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, - individualURI, - VisualizationFrameworkConstants.VIS_TYPE_KEY, - VisualizationFrameworkConstants.PERSON_LEVEL_VIS); - - String fullTimelineNetworkURL = UrlBuilder.getUrl( - VisualizationFrameworkConstants.FREEMARKERIZED_VISUALIZATION_URL_PREFIX, - fullTimelineNetworkURLParams); - - fullTimelineLink = "View all VIVO " - + "grants and corresponding co-pi network."; - - sparklineData.setFullTimelineNetworkLink(fullTimelineNetworkURL); - - - - } else { - fullTimelineLink = "No data available to render full timeline.
"; - } - - divContextCode.append("" + fullTimelineLink + ""); - return divContextCode.toString(); - } - - private String generateDataTable() { - - String csvDownloadURLHref = ""; - - if (getCSVDownloadURL() != null) { - csvDownloadURLHref = "(.CSV File)"; - } else { - csvDownloadURLHref = ""; - } - - StringBuilder dataTable = new StringBuilder(); - - dataTable.append("" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + ""); - - for (Entry currentEntry : yearToGrantCount.entrySet()) { - dataTable.append("" - + "" - + "" - + ""); - } - - dataTable.append("\n
Grants per year " + csvDownloadURLHref + "
YearGrants
" + currentEntry.getKey() + "" + currentEntry.getValue() + "
\n"); - - return dataTable.toString(); + return sparklineData; } public SparklineData getValueObjectContainer() { - return sparklineData; + return this.sparklineParameterVO; } -} +} \ No newline at end of file diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java index 86699cd0..f8019d34 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java @@ -5,27 +5,23 @@ package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.personpubcount import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import java.util.Map.Entry; import org.apache.commons.logging.Log; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.BiboDocument; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -@SuppressWarnings("serial") public class PersonPublicationCountVisCodeGenerator { /* @@ -37,24 +33,16 @@ public class PersonPublicationCountVisCodeGenerator { * spanning the career of the person & last 10 years at the minimum, in case if * the person started his career in the last 10 yeras. * */ - private static final Map VIS_DIV_NAMES = new HashMap() { { - put("SHORT_SPARK", "pub_count_short_sparkline_vis"); - put("FULL_SPARK", "pub_count_full_sparkline_vis"); - - } }; - - private static final String VISUALIZATION_STYLE_CLASS = "sparkline_style"; - private static final String DEFAULT_VIS_CONTAINER_DIV_ID = "pub_count_vis_container"; private Map yearToPublicationCount; private Log log; - private SparklineData sparklineData; - private String individualURI; + + private SparklineData sparklineParameterVO; public PersonPublicationCountVisCodeGenerator(String individualURIParam, String visMode, @@ -66,44 +54,28 @@ public class PersonPublicationCountVisCodeGenerator { this.individualURI = individualURIParam; this.yearToPublicationCount = yearToPublicationCount; - this.sparklineData = new SparklineData(); - - sparklineData.setYearToActivityCount(yearToPublicationCount); - - + this.log = log; - generateVisualizationCode(visMode, visContainer, authorDocuments); + this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer, authorDocuments); + } /** - * This method is used to generate the visualization code (HMTL, CSS & JavaScript). - * There 2 parts to it - 1. Actual Content Code & 2. Context Code. - * 1. Actual Content code in this case is the sparkline image, text related to - * data and the wrapping tables. This is generated via call to google vis API through - * JavaScript. - * 2. Context code is generally optional but contains code pertaining to tabulated - * data & links to download files etc. + * This method is used to setup parameters for the sparkline value object. These parameters + * will be used in the template to construct the actual html/javascript code. * @param visMode * @param visContainer * @param authorDocuments + * @return */ - private void generateVisualizationCode(String visMode, - String visContainer, - Set authorDocuments) { + private SparklineData setupSparklineParameters(String visMode, + String providedVisContainerID, + Set authorDocuments) { + + SparklineData sparklineData = new SparklineData(); + sparklineData.setYearToActivityCount(yearToPublicationCount); - sparklineData.setSparklineContent(getMainVisualizationCode(authorDocuments, - visMode, - visContainer)); - - - sparklineData.setSparklineContext(getVisualizationContextCode(visMode)); - - } - - private String getMainVisualizationCode(Set authorDocuments, - String visMode, - String providedVisContainerID) { int numOfYearsToBeRendered = 0; int currentYear = Calendar.getInstance().get(Calendar.YEAR); @@ -127,8 +99,6 @@ public class PersonPublicationCountVisCodeGenerator { String visContainerID = null; - StringBuilder visualizationCode = new StringBuilder(); - if (yearToPublicationCount.size() > 0) { try { minPublishedYear = Integer.parseInt(Collections.min(publishedYears)); @@ -159,37 +129,6 @@ public class PersonPublicationCountVisCodeGenerator { sparklineData.setNumOfYearsToBeRendered(numOfYearsToBeRendered); - visualizationCode.append("\n"); - - visualizationCode.append("\n"; + return sparklineData; } - private String getVisualizationContextCode(String visMode) { - - String visualizationContextCode = ""; - if (VisualizationFrameworkConstants.SHORT_SPARKLINE_VIS_MODE.equalsIgnoreCase(visMode)) { - visualizationContextCode = generateShortVisContext(); - } else { - visualizationContextCode = generateFullVisContext(); - } - - log.debug(visualizationContextCode); - - return visualizationContextCode; - } - - private String generateFullVisContext() { - - StringBuilder divContextCode = new StringBuilder(); - - String csvDownloadURLHref = ""; - - if (yearToPublicationCount.size() > 0) { - - if (getCSVDownloadURL() != null) { - - csvDownloadURLHref = "Download data as .csv file.
"; - sparklineData.setDownloadDataLink(getCSVDownloadURL()); - - } else { - csvDownloadURLHref = ""; - } - } else { - csvDownloadURLHref = "No data available to export.
"; - } - - String tableCode = generateDataTable(); - - divContextCode.append("

" + tableCode + csvDownloadURLHref + "

"); - - sparklineData.setTable(tableCode); - - return divContextCode.toString(); - } - - private String getCSVDownloadURL() { - - if (yearToPublicationCount.size() > 0) { - - ParamMap CSVDownloadURLParams = new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, - individualURI, - VisualizationFrameworkConstants.VIS_TYPE_KEY, - VisualizationFrameworkConstants.PERSON_PUBLICATION_COUNT_VIS); - - return UrlBuilder.getUrl(VisualizationFrameworkConstants.DATA_VISUALIZATION_SERVICE_URL_PREFIX, - CSVDownloadURLParams); - - } else { - return null; - } - } - - private String generateShortVisContext() { - - StringBuilder divContextCode = new StringBuilder(); - - String fullTimelineLink; - if (yearToPublicationCount.size() > 0) { - - ParamMap fullTimelineNetworkURLParams = new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, - individualURI, - VisualizationFrameworkConstants.VIS_TYPE_KEY, - VisualizationFrameworkConstants.PERSON_LEVEL_VIS); - - String fullTimelineNetworkURL = UrlBuilder.getUrl( - VisualizationFrameworkConstants.FREEMARKERIZED_VISUALIZATION_URL_PREFIX, - fullTimelineNetworkURLParams); - - - fullTimelineLink = "View all VIVO " - + "publications and corresponding co-author network."; - - sparklineData.setFullTimelineNetworkLink(fullTimelineNetworkURL); - - } else { - fullTimelineLink = "No data available to render full timeline.
"; - } - - divContextCode.append("" + fullTimelineLink + ""); - return divContextCode.toString(); - } - - private String generateDataTable() { - - String csvDownloadURLHref = ""; - - if (getCSVDownloadURL() != null) { - csvDownloadURLHref = "(.CSV File)"; - } else { - csvDownloadURLHref = ""; - } - - StringBuilder dataTable = new StringBuilder(); - - dataTable.append("" - + "" - + "" - + "" - + "" - + "" - + "" - + "" - + ""); - - for (Entry currentEntry : yearToPublicationCount.entrySet()) { - dataTable.append("" - + "" - + "" - + ""); - } - - dataTable.append("\n
Publications per year " + csvDownloadURLHref + "
YearPublications
" + currentEntry.getKey() + "" + currentEntry.getValue() + "
\n"); - - return dataTable.toString(); - } - public SparklineData getValueObjectContainer() { - return sparklineData; + return this.sparklineParameterVO; } -} +} \ No newline at end of file diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SparklineData.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SparklineData.java index 0ca5b5a3..905a42bd 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SparklineData.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SparklineData.java @@ -7,14 +7,6 @@ import java.util.Map; public class SparklineData { - /* - * For now sparklineNumPublicationsText & sparklinePublicationRangeText is left - * as empty but later on we would want to leverage the granularity that this - * provides. - * */ - private String sparklineNumPublicationsText = ""; - private String sparklinePublicationRangeText = ""; - private Integer earliestYearConsidered; private Integer earliestRenderedPublicationYear; private Integer latestRenderedPublicationYear; @@ -25,17 +17,12 @@ public class SparklineData { private Integer unknownYearPublications; private Integer unknownYearGrants; - private Map yearToActivityCount; - private String table = ""; - private String downloadDataLink = ""; private String fullTimelineNetworkLink = ""; private String visContainerDivID = "pub_count_vis_container"; - private String sparklineContent; - private String sparklineContext; private boolean isShortVisMode = true; @@ -43,23 +30,6 @@ public class SparklineData { private int numOfYearsToBeRendered; - public String getSparklineNumPublicationsText() { - return sparklineNumPublicationsText; - } - - public void setSparklineNumPublicationsText(String sparklineNumPublicationsText) { - this.sparklineNumPublicationsText = sparklineNumPublicationsText; - } - - public String getSparklinePublicationRangeText() { - return sparklinePublicationRangeText; - } - - public void setSparklinePublicationRangeText( - String sparklinePublicationRangeText) { - this.sparklinePublicationRangeText = sparklinePublicationRangeText; - } - public Integer getEarliestRenderedGrantYear() { return earliestRenderedGrantYear; } @@ -151,14 +121,6 @@ public class SparklineData { return renderedSparks; } - public String getTable() { - return table; - } - - public void setTable(String table) { - this.table = table; - } - public String getDownloadDataLink() { return downloadDataLink; } @@ -183,14 +145,6 @@ public class SparklineData { return visContainerDivID; } - public String getSparklineContent() { - return sparklineContent; - } - - public void setSparklineContent(String shortSparklineContent) { - this.sparklineContent = shortSparklineContent; - } - public void setShortVisMode(boolean isShortVisMode) { this.isShortVisMode = isShortVisMode; } @@ -199,11 +153,4 @@ public class SparklineData { return isShortVisMode; } - public String getSparklineContext() { - return sparklineContext; - } - - public void setSparklineContext(String shortSparklineContext) { - this.sparklineContext = shortSparklineContext; - } } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UtilityFunctions.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UtilityFunctions.java index 87b45674..dd52e479 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UtilityFunctions.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UtilityFunctions.java @@ -3,10 +3,8 @@ package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; @@ -20,11 +18,12 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormatter; -import org.joda.time.format.ISODateTimeFormat; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; @@ -33,8 +32,8 @@ import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.BiboDocument; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.CoAuthorshipData; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.CoPIData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Grant; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.CoPINode; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Grant; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Node; public class UtilityFunctions { @@ -276,5 +275,50 @@ public class UtilityFunctions { * */ return null; } + + public static String getCSVDownloadURL(String individualURI, String visType, String visMode) { + + ParamMap CSVDownloadURLParams = null; + + if (StringUtils.isBlank(visMode)) { + + CSVDownloadURLParams = new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, + individualURI, + VisualizationFrameworkConstants.VIS_TYPE_KEY, + visType); + + } else { + + CSVDownloadURLParams = new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, + individualURI, + VisualizationFrameworkConstants.VIS_TYPE_KEY, + visType, + VisualizationFrameworkConstants.VIS_MODE_KEY, + visMode); + + } + + String csvDownloadLink = UrlBuilder.getUrl(VisualizationFrameworkConstants.DATA_VISUALIZATION_SERVICE_URL_PREFIX, + CSVDownloadURLParams); + + return csvDownloadLink != null ? csvDownloadLink : "" ; + + } + + public static String getCollaboratorshipNetworkLink(String individualURI, String visType, String visMode) { + + ParamMap collaboratorshipNetworkURLParams = new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, + individualURI, + VisualizationFrameworkConstants.VIS_TYPE_KEY, + visType, + VisualizationFrameworkConstants.VIS_MODE_KEY, + visMode); + + String collaboratorshipNetworkURL = UrlBuilder.getUrl( + VisualizationFrameworkConstants.FREEMARKERIZED_VISUALIZATION_URL_PREFIX, + collaboratorshipNetworkURLParams); + + return collaboratorshipNetworkURL != null ? collaboratorshipNetworkURL : "" ; + } } From 4299483b817bf76004dbb517188ef74ae24fb308 Mon Sep 17 00:00:00 2001 From: bkoniden Date: Tue, 8 Feb 2011 21:44:17 +0000 Subject: [PATCH 373/427] NIHVIVO- 1993 Testing CONSTRUCT + SELECT for CoPIGrantCount, EntityPubCount, EntityGrantCount and EntitySubOrganizationTypesCount. --- .../CoPIGrantCountConstructQueryRunner.java | 252 +++++++++++++ .../CoPIGrantCountQueryRunner.java | 7 +- .../CoPIGrantCountRequestHandler.java | 6 +- .../EntityComparisonUtilityFunctions.java | 12 +- ...yPublicationCountConstructQueryRunner.java | 258 +++++++++++++ .../EntityPublicationCountQueryRunner.java | 29 +- .../EntityPublicationCountRequestHandler.java | 17 +- ...OrganizationTypesConstructQueryRunner.java | 178 +++++++++ ...EntitySubOrganizationTypesQueryRunner.java | 26 +- .../EntityGrantCountConstructQueryRunner.java | 342 ++++++++++++++++++ .../EntityGrantCountQueryRunner.java | 53 ++- .../EntityGrantCountRequestHandler.java | 16 +- .../PersonLevelRequestHandler.java | 11 +- 13 files changed, 1133 insertions(+), 74 deletions(-) create mode 100644 src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java create mode 100644 src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountConstructQueryRunner.java create mode 100644 src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java create mode 100644 src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountConstructQueryRunner.java diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java new file mode 100644 index 00000000..210dc91e --- /dev/null +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java @@ -0,0 +1,252 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator; + +import java.util.HashSet; +import java.util.Set; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.hp.hpl.jena.iri.IRI; +import com.hp.hpl.jena.iri.IRIFactory; +import com.hp.hpl.jena.iri.Violation; +import com.hp.hpl.jena.query.DataSource; +import com.hp.hpl.jena.query.Query; +import com.hp.hpl.jena.query.QueryExecution; +import com.hp.hpl.jena.query.QueryExecutionFactory; +import com.hp.hpl.jena.query.QueryFactory; +import com.hp.hpl.jena.query.Syntax; +import com.hp.hpl.jena.rdf.model.Model; +import com.hp.hpl.jena.rdf.model.ModelFactory; + +import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; + + +public class CoPIGrantCountConstructQueryRunner { + + protected static final Syntax SYNTAX = Syntax.syntaxARQ; + + private String egoURI; + + private DataSource dataSource; + + private Log log = LogFactory.getLog(CoPIGrantCountConstructQueryRunner.class.getName()); + + + private static final String SPARQL_QUERY_COMMON_CONSTRUCT_AND_WHERE_STRING = + "?Role core:roleIn ?Grant . " + + "?Grant rdfs:label ?GrantLabel . " + + "?Grant core:relatedRole ?RelatedRole . "; + + public CoPIGrantCountConstructQueryRunner(String egoURI, DataSource dataSource, Log log){ + this.egoURI = egoURI; + this.dataSource = dataSource; + //this.log = log; + } + + private String generateConstructQueryForInvestigatorLabel(String queryURI) { + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> rdfs:label ?investigatorLabel ." + + "}" + + "WHERE {" + + "<"+queryURI+ "> rdfs:label ?investigatorLabel " + + "}"; + + return sparqlQuery; + } + + private String generateConstructQueryForInvestigatorRoleOfProperty(String queryURI){ + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + SPARQL_QUERY_COMMON_CONSTRUCT_AND_WHERE_STRING + + "?RelatedRole core:investigatorRoleOf ?coInvestigator ." + + "?coInvestigator rdfs:label ?coInvestigatorLabel . " + + "}" + + "WHERE { " + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + SPARQL_QUERY_COMMON_CONSTRUCT_AND_WHERE_STRING + + "?RelatedRole core:investigatorRoleOf ?coInvestigator ." + + "?coInvestigator rdfs:label ?coInvestigatorLabel . " + + "}"; + + return sparqlQuery; + } + + private String generateConstructQueryForPrincipalInvestigatorRoleOfProperty(String queryURI){ + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + SPARQL_QUERY_COMMON_CONSTRUCT_AND_WHERE_STRING + + "?RelatedRole core:principalInvestigatorRoleOf ?coInvestigator ." + + "?coInvestigator rdfs:label ?coInvestigatorLabel . " + + "}" + + "WHERE { " + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + SPARQL_QUERY_COMMON_CONSTRUCT_AND_WHERE_STRING + + "?RelatedRole core:principalInvestigatorRoleOf ?coInvestigator ." + + "?coInvestigator rdfs:label ?coInvestigatorLabel . " + + "}"; + + return sparqlQuery; + } + + private String generateConstructQueryForCoPrincipalInvestigatorRoleOfProperty(String queryURI){ + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + SPARQL_QUERY_COMMON_CONSTRUCT_AND_WHERE_STRING + + "?RelatedRole core:co-PrincipalInvestigatorRoleOf ?coInvestigator ." + + "?coInvestigator rdfs:label ?coInvestigatorLabel . " + + "}" + + "WHERE { " + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + SPARQL_QUERY_COMMON_CONSTRUCT_AND_WHERE_STRING + + "?RelatedRole core:co-PrincipalInvestigatorRoleOf ?coInvestigator ." + + "?coInvestigator rdfs:label ?coInvestigatorLabel . " + + "}"; + + return sparqlQuery; + } + + private String generateConstructQueryForDateTimeValueofRole(String queryURI){ + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + "?Role core:dateTimeInterval ?dateTimeIntervalValue . " + + "?dateTimeIntervalValue core:start ?startDate . " + + "?startDate core:dateTime ?startDateTimeValue . " + + "?dateTimeIntervalValue core:end ?endDate . " + + "?endDate core:dateTime ?endDateTimeValue . " + + "}" + + "WHERE { " + + "{" + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + "?Role core:dateTimeInterval ?dateTimeIntervalValue . " + + "?dateTimeIntervalValue core:start ?startDate . " + + "?startDate core:dateTime ?startDateTimeValue . " + + "} UNION " + + "{" + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + "?Role core:dateTimeInterval ?dateTimeIntervalValue . " + + "?dateTimeIntervalValue core:end ?endDate . " + + "?endDate core:dateTime ?endDateTimeValue . " + + "}" + + "}"; + + return sparqlQuery; + } + + private String generateConstructQueryForDateTimeValueofGrant(String queryURI){ + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant core:dateTimeInterval ?dateTimeIntervalValueForGrant . " + + "?dateTimeIntervalValueForGrant core:start ?startDateForGrant . " + + "?startDateForGrant core:dateTime ?startDateTimeValueForGrant . " + + "?dateTimeIntervalValueForGrant core:end ?endDateForGrant . " + + "?endDateForGrant core:dateTime ?endDateTimeValueForGrant . " + + "}" + + "WHERE { " + + "{" + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant core:dateTimeInterval ?dateTimeIntervalValueForGrant . " + + "?dateTimeIntervalValueForGrant core:start ?startDateForGrant . " + + "?startDateForGrant core:dateTime ?startDateTimeValueForGrant . " + + "} UNION " + + "{" + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant core:dateTimeInterval ?dateTimeIntervalValueForGrant . " + + "?dateTimeIntervalValueForGrant core:end ?endDateForGrant . " + + "?endDateForGrant core:dateTime ?endDateTimeValueForGrant . " + + "}" + + "}"; + + return sparqlQuery; + } + + private Model executeQuery(Set constructQueries, DataSource dataSource) { + + Model constructedModel = ModelFactory.createDefaultModel(); + + for (String queryString : constructQueries) { + + log.debug("CONSTRUCT query string : " + queryString); + + Query query = null; + + try{ + query = QueryFactory.create(QueryConstants.getSparqlPrefixQuery() + queryString, SYNTAX); + }catch(Throwable th){ + log.error("Could not create CONSTRUCT SPARQL query for query " + + "string. " + th.getMessage()); + log.error(queryString); + } + + QueryExecution qe = QueryExecutionFactory.create( + query, dataSource); + try { + qe.execConstruct(constructedModel); + } finally { + qe.close(); + } + + } + + return constructedModel; + } + + public Model getConstructedModel() + throws MalformedQueryParametersException { + + if (StringUtils.isNotBlank(this.egoURI)) { + /* + * To test for the validity of the URI submitted. + * */ + IRIFactory iRIFactory = IRIFactory.jenaImplementation(); + IRI iri = iRIFactory.create(this.egoURI); + if (iri.hasViolation(false)) { + String errorMsg = ((Violation) iri.violations(false).next()).getShortMessage(); + log.error("Ego Co-PI Vis Query " + errorMsg); + throw new MalformedQueryParametersException( + "URI provided for an individual is malformed."); + } + } else { + throw new MalformedQueryParametersException("URI parameter is either null or empty."); + } + + Set constructQueries = new HashSet(); + + populateConstructQueries(constructQueries); + + Model model = executeQuery(constructQueries, + this.dataSource); + + return model; + + } + + private void populateConstructQueries(Set constructQueries) { + + constructQueries.add(generateConstructQueryForInvestigatorLabel(this.egoURI)); + constructQueries.add(generateConstructQueryForInvestigatorRoleOfProperty(this.egoURI)); + constructQueries.add(generateConstructQueryForCoPrincipalInvestigatorRoleOfProperty(this.egoURI)); + constructQueries.add(generateConstructQueryForPrincipalInvestigatorRoleOfProperty(this.egoURI)); + constructQueries.add(generateConstructQueryForDateTimeValueofRole(this.egoURI)); + constructQueries.add(generateConstructQueryForDateTimeValueofGrant(this.egoURI)); + + + } +} \ No newline at end of file diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java index 8fb49116..f7991250 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java @@ -24,6 +24,7 @@ import com.hp.hpl.jena.query.QueryFactory; import com.hp.hpl.jena.query.QuerySolution; import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.query.Syntax; +import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; @@ -47,7 +48,7 @@ public class CoPIGrantCountQueryRunner implements QueryRunner { private String egoURI; - private DataSource dataSource; + private Model dataSource; private Log log; @@ -79,7 +80,7 @@ public class CoPIGrantCountQueryRunner implements QueryRunner { public CoPIGrantCountQueryRunner(String egoURI, - DataSource dataSource, Log log) { + Model dataSource, Log log) { this.egoURI = egoURI; this.dataSource = dataSource; @@ -322,7 +323,7 @@ public class CoPIGrantCountQueryRunner implements QueryRunner { } - private ResultSet executeQuery(String queryText, DataSource dataSource) { + private ResultSet executeQuery(String queryText, Model dataSource) { QueryExecution queryExecution = null; Query query = QueryFactory.create(queryText, SYNTAX); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountRequestHandler.java index fa6b6422..5b941427 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountRequestHandler.java @@ -12,6 +12,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import com.hp.hpl.jena.query.DataSource; +import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -46,7 +47,10 @@ public class CoPIGrantCountRequestHandler implements VisualizationRequestHandler String egoURI = vitroRequest.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY); String visMode = vitroRequest.getParameter(VisualizationFrameworkConstants.VIS_MODE_KEY); - QueryRunner queryManager = new CoPIGrantCountQueryRunner(egoURI, dataSource, log); + CoPIGrantCountConstructQueryRunner constructQueryRunner = new CoPIGrantCountConstructQueryRunner(egoURI, dataSource, log); + Model constructedModel = constructQueryRunner.getConstructedModel(); + + QueryRunner queryManager = new CoPIGrantCountQueryRunner(egoURI, constructedModel, log); CoPIData PINodesAndEdges = queryManager.getQueryResult(); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java index 494a9f3e..aa753a06 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java @@ -10,6 +10,7 @@ import org.apache.commons.logging.Log; import com.hp.hpl.jena.query.DataSource; import com.hp.hpl.jena.query.QuerySolution; import com.hp.hpl.jena.query.ResultSet; +import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; @@ -93,11 +94,16 @@ public class EntityComparisonUtilityFunctions { public static Map> getSubEntityTypes(Log log, DataSource dataSource, String subjectOrganization) throws MalformedQueryParametersException { - QueryRunner>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner( - subjectOrganization, dataSource, log); + EntitySubOrganizationTypesConstructQueryRunner constructQueryRunnerForSubOrganizationTypes = new EntitySubOrganizationTypesConstructQueryRunner(subjectOrganization, dataSource, log) ; + Model constructedModelForSubOrganizationTypes = constructQueryRunnerForSubOrganizationTypes.getConstructedModel(); + + QueryRunner>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner( + subjectOrganization, constructedModelForSubOrganizationTypes, log); + Map> subOrganizationTypesResult = queryManagerForsubOrganisationTypes - .getQueryResult(); + .getQueryResult(); + return subOrganizationTypesResult; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountConstructQueryRunner.java new file mode 100644 index 00000000..a1f3b486 --- /dev/null +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountConstructQueryRunner.java @@ -0,0 +1,258 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; + +import java.util.LinkedHashSet; +import java.util.Set; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.hp.hpl.jena.iri.IRI; +import com.hp.hpl.jena.iri.IRIFactory; +import com.hp.hpl.jena.iri.Violation; +import com.hp.hpl.jena.query.DataSource; +import com.hp.hpl.jena.query.Query; +import com.hp.hpl.jena.query.QueryExecution; +import com.hp.hpl.jena.query.QueryExecutionFactory; +import com.hp.hpl.jena.query.QueryFactory; +import com.hp.hpl.jena.query.Syntax; +import com.hp.hpl.jena.rdf.model.Model; +import com.hp.hpl.jena.rdf.model.ModelFactory; + +import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; + +public class EntityPublicationCountConstructQueryRunner { + + protected static final Syntax SYNTAX = Syntax.syntaxARQ; + + private String egoURI; + + private DataSource dataSource; + + private Log log = LogFactory.getLog(EntityPublicationCountConstructQueryRunner.class.getName()); + + public EntityPublicationCountConstructQueryRunner(String egoURI, DataSource dataSource, Log log){ + this.egoURI = egoURI; + this.dataSource = dataSource; + //this.log = log; + } + + private String generateConstructQueryForOrganizationLabel(String queryURI) { + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> rdfs:label ?organizationLabel ." + + "}" + + "WHERE {" + + "<"+queryURI+ "> rdfs:label ?organizationLabel " + + "}"; + + return sparqlQuery; + } + + private String generateConstructQueryForSubOrganizations(String queryURI){ + + String sparqlQuery = + + "CONSTRUCT { " + + "<"+queryURI+ "> core:hasSubOrganization ?subOrganization . " + + "?subOrganization rdfs:label ?subOrganizationLabel . " + + "?subOrganization core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person core:authorInAuthorship ?Resource . " + + "?Person rdfs:label ?PersonLabel . " + + "?Resource core:linkedInformationResource ?Document . " + + "?Document rdf:type bibo:Document . " + + "?Document rdfs:label ?DocumentLabel " + +"}" + + "WHERE { " + + "<"+queryURI+ "> core:hasSubOrganization ?subOrganization . " + + "?subOrganization rdfs:label ?subOrganizationLabel . " + + "?subOrganization core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person core:authorInAuthorship ?Resource . " + + "?Person rdfs:label ?PersonLabel . " + + "?Resource core:linkedInformationResource ?Document . " + + "?Document rdf:type bibo:Document . " + + "?Document rdfs:label ?DocumentLabel " + + "}" ; + + + return sparqlQuery; + + } + + private String generateConstructQueryForPersons(String queryURI){ + + String sparqlQuery = + + "CONSTRUCT { " + + "<"+queryURI+ "> core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person core:authorInAuthorship ?Resource . " + + "?Person rdfs:label ?PersonLabel . " + + "?Resource core:linkedInformationResource ?Document . " + + "?Document rdf:type bibo:Document . " + + "?Document rdfs:label ?DocumentLabel " + +"}" + + "WHERE { " + + "<"+queryURI+ "> core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person core:authorInAuthorship ?Resource . " + + "?Person rdfs:label ?PersonLabel . " + + "?Resource core:linkedInformationResource ?Document . " + + "?Document rdf:type bibo:Document . " + + "?Document rdfs:label ?DocumentLabel " + + "}" ; + + + return sparqlQuery; + + } + + private String generateConstructQueryForDocumentDateTimeValueOneLevelDeep(String queryURI){ + + String sparqlQuery = + + "CONSTRUCT { " + + "<"+queryURI+ "> core:hasSubOrganization ?subOrganization . " + + "?subOrganization core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person core:authorInAuthorship ?Resource . " + + "?Resource core:linkedInformationResource ?Document . " + + "?Document rdf:type bibo:Document . " + + "?Document core:dateTimeValue ?dateTimeValue . " + + "?dateTimeValue core:dateTime ?publicationDate . " + + "?Document core:year ?publicationYearUsing_1_1_property " + +"}" + + "WHERE { " + + "<"+queryURI+ "> core:hasSubOrganization ?subOrganization . " + + "?subOrganization core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person core:authorInAuthorship ?Resource . " + + "?Resource core:linkedInformationResource ?Document . " + + "?Document rdf:type bibo:Document . " + + "{" + + "?Document core:dateTimeValue ?dateTimeValue . " + + "?dateTimeValue core:dateTime ?publicationDate " + + "}" + + "UNION " + + "{" + + "?Document core:year ?publicationYearUsing_1_1_property " + + "}" + + "}" ; + + + return sparqlQuery; + + } + + private String generateConstructQueryForDocumentDateTimeValue(String queryURI){ + + String sparqlQuery = + + "CONSTRUCT { " + + "<"+queryURI+ "> core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person core:authorInAuthorship ?Resource . " + + "?Resource core:linkedInformationResource ?Document . " + + "?Document rdf:type bibo:Document . " + + "?Document core:dateTimeValue ?dateTimeValue . " + + "?dateTimeValue core:dateTime ?publicationDate . " + + "?Document core:year ?publicationYearUsing_1_1_property " + +"}" + + "WHERE { " + + "<"+queryURI+ "> core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person core:authorInAuthorship ?Resource . " + + "?Resource core:linkedInformationResource ?Document . " + + "?Document rdf:type bibo:Document . " + + "{" + + "?Document core:dateTimeValue ?dateTimeValue . " + + "?dateTimeValue core:dateTime ?publicationDate " + + "}" + + "UNION " + + "{" + + "?Document core:year ?publicationYearUsing_1_1_property " + + "}" + + "}" ; + + + return sparqlQuery; + + } + + private Model executeQuery(Set constructQueries, DataSource dataSource) { + + Model constructedModel = ModelFactory.createDefaultModel(); + + for (String queryString : constructQueries) { + + log.debug("CONSTRUCT query string : " + queryString); + + Query query = null; + + try{ + query = QueryFactory.create(QueryConstants.getSparqlPrefixQuery() + queryString, SYNTAX); + //log.info("query: "+ queryString); + }catch(Throwable th){ + log.error("Could not create CONSTRUCT SPARQL query for query " + + "string. " + th.getMessage()); + log.error(queryString); + } + + QueryExecution qe = QueryExecutionFactory.create( + query, dataSource); + try { + qe.execConstruct(constructedModel); + } finally { + qe.close(); + } + + } + // constructedModel.write(System.out); + return constructedModel; + } + + public Model getConstructedModel() + throws MalformedQueryParametersException { + + if (StringUtils.isNotBlank(this.egoURI)) { + /* + * To test for the validity of the URI submitted. + * */ + IRIFactory iRIFactory = IRIFactory.jenaImplementation(); + IRI iri = iRIFactory.create(this.egoURI); + if (iri.hasViolation(false)) { + String errorMsg = ((Violation) iri.violations(false).next()).getShortMessage(); + log.error("Entity Pub Count Construct Query " + errorMsg); + throw new MalformedQueryParametersException( + "URI provided for an individual is malformed."); + } + } else { + throw new MalformedQueryParametersException("URI parameter is either null or empty."); + } + + Set constructQueries = new LinkedHashSet(); + + populateConstructQueries(constructQueries); + + Model model = executeQuery(constructQueries, + this.dataSource); + + return model; + + } + + private void populateConstructQueries(Set constructQueries) { + + constructQueries.add(generateConstructQueryForOrganizationLabel(this.egoURI)); + constructQueries.add(generateConstructQueryForSubOrganizations(this.egoURI)); + constructQueries.add(generateConstructQueryForPersons(this.egoURI)); + constructQueries.add(generateConstructQueryForDocumentDateTimeValueOneLevelDeep(this.egoURI)); + constructQueries.add(generateConstructQueryForDocumentDateTimeValue(this.egoURI)); + + } +} diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java index a0535307..91f7a5b6 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java @@ -12,7 +12,6 @@ import org.apache.commons.logging.LogFactory; import com.hp.hpl.jena.iri.IRI; import com.hp.hpl.jena.iri.IRIFactory; import com.hp.hpl.jena.iri.Violation; -import com.hp.hpl.jena.query.DataSource; import com.hp.hpl.jena.query.Query; import com.hp.hpl.jena.query.QueryExecution; import com.hp.hpl.jena.query.QueryExecutionFactory; @@ -21,6 +20,8 @@ import com.hp.hpl.jena.query.QuerySolution; import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.query.Syntax; import com.hp.hpl.jena.rdf.model.RDFNode; +import com.hp.hpl.jena.rdf.model.Model; + import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; @@ -44,18 +45,16 @@ public class EntityPublicationCountQueryRunner implements QueryRunner { protected static final Syntax SYNTAX = Syntax.syntaxARQ; private String entityURI; - private DataSource dataSource; + private Model dataSource; private Log log = LogFactory.getLog(EntityPublicationCountQueryRunner.class.getName()); private static final String SPARQL_QUERY_COMMON_SELECT_CLAUSE = "" + " (str(?Person) as ?personLit) " + " (str(?PersonLabel) as ?personLabelLit) " - + " (str(?SecondaryPositionLabel) as ?SecondaryPositionLabelLit)" + " (str(?Document) as ?documentLit) " + " (str(?DocumentLabel) as ?documentLabelLit) " + " (str(?publicationDate) as ?" + QueryFieldLabels.DOCUMENT_PUBLICATION_DATE + ") " - + " (str(?publicationYearUsing_1_1_property) as ?" + QueryFieldLabels.DOCUMENT_PUBLICATION_YEAR_USING_1_1_PROPERTY + ") " - + " (str(?StartYear) as ?StartYearLit)"; + + " (str(?publicationYearUsing_1_1_property) as ?" + QueryFieldLabels.DOCUMENT_PUBLICATION_YEAR_USING_1_1_PROPERTY + ") "; private static final String SPARQL_QUERY_COMMON_WHERE_CLAUSE = "" @@ -63,8 +62,7 @@ public class EntityPublicationCountQueryRunner implements QueryRunner { + " rdfs:label ?DocumentLabel ." + "OPTIONAL { ?Document core:dateTimeValue ?dateTimeValue . " + " ?dateTimeValue core:dateTime ?publicationDate } ." - + "OPTIONAL { ?Document core:year ?publicationYearUsing_1_1_property } ." - + "OPTIONAL { ?SecondaryPosition core:startYear ?StartYear } ."; + + "OPTIONAL { ?Document core:year ?publicationYearUsing_1_1_property } ." ; private static String ENTITY_LABEL; private static String ENTITY_URL; @@ -72,7 +70,7 @@ public class EntityPublicationCountQueryRunner implements QueryRunner { private static String SUBENTITY_URL; public EntityPublicationCountQueryRunner(String entityURI, - DataSource dataSource, Log log) { + Model dataSource, Log log) { this.entityURI = entityURI; this.dataSource = dataSource; @@ -208,7 +206,7 @@ public class EntityPublicationCountQueryRunner implements QueryRunner { return entity; } - private ResultSet executeQuery(String queryURI, DataSource dataSource) { + private ResultSet executeQuery(String queryURI, Model dataSource) { QueryExecution queryExecution = null; Query query = QueryFactory.create( @@ -240,23 +238,20 @@ public class EntityPublicationCountQueryRunner implements QueryRunner { + " (str(?subOrganizationLabel) as ?subOrganizationLabelLit) " + SPARQL_QUERY_COMMON_SELECT_CLAUSE + " (str(<" + queryURI + ">) as ?" + ENTITY_URL + ") " - + "WHERE { " + "<" + queryURI + "> rdf:type foaf:Organization ;" - + " rdfs:label ?organizationLabel ." + + "WHERE { " + "<" + queryURI + "> rdfs:label ?organizationLabel ." + "{ " + "<" + queryURI + "> core:hasSubOrganization ?subOrganization ." + "?subOrganization rdfs:label ?subOrganizationLabel ; core:organizationForPosition ?Position . " - + " ?Position rdf:type core:Position ; core:positionForPerson ?Person ." - + " ?Person core:authorInAuthorship ?Resource ; rdfs:label ?PersonLabel ; core:personInPosition ?SecondaryPosition . " + + " ?Position core:positionForPerson ?Person ." + + " ?Person core:authorInAuthorship ?Resource ; rdfs:label ?PersonLabel . " + " ?Resource core:linkedInformationResource ?Document . " - + " ?SecondaryPosition rdfs:label ?SecondaryPositionLabel ." + SPARQL_QUERY_COMMON_WHERE_CLAUSE + "}" + "UNION " + "{ " + "<" + queryURI + "> core:organizationForPosition ?Position ." - + " ?Position rdf:type core:Position ; core:positionForPerson ?Person ." - + " ?Person core:authorInAuthorship ?Resource ; rdfs:label ?PersonLabel ; core:personInPosition ?SecondaryPosition . " + + " ?Position core:positionForPerson ?Person ." + + " ?Person core:authorInAuthorship ?Resource ; rdfs:label ?PersonLabel . " + " ?Resource core:linkedInformationResource ?Document ." - + " ?SecondaryPosition rdfs:label ?SecondaryPositionLabel ." + SPARQL_QUERY_COMMON_WHERE_CLAUSE + "}" + "}"; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java index 9cf5e9a9..b1f68c82 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java @@ -19,6 +19,8 @@ import com.hp.hpl.jena.iri.IRI; import com.hp.hpl.jena.iri.IRIFactory; import com.hp.hpl.jena.iri.Violation; import com.hp.hpl.jena.query.DataSource; +import com.hp.hpl.jena.rdf.model.Model; + import edu.cornell.mannlib.vitro.webapp.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.beans.Portal; @@ -90,17 +92,21 @@ public class EntityPublicationCountRequestHandler implements } } - - + private ResponseValues getSubjectEntityAndGenerateResponse( VitroRequest vitroRequest, Log log, DataSource dataSource, String subjectEntityURI) throws MalformedQueryParametersException { + EntityPublicationCountConstructQueryRunner constructQueryRunner = new EntityPublicationCountConstructQueryRunner(subjectEntityURI, dataSource, log); + Model constructedModel = constructQueryRunner.getConstructedModel(); + QueryRunner queryManager = new EntityPublicationCountQueryRunner( - subjectEntityURI, dataSource, log); + subjectEntityURI, constructedModel, log); + Entity entity = queryManager.getQueryResult(); + if (entity.getEntityLabel().equals("no-label")) { @@ -136,8 +142,11 @@ public class EntityPublicationCountRequestHandler implements String entityURI = vitroRequest .getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY); + EntityPublicationCountConstructQueryRunner constructQueryRunner = new EntityPublicationCountConstructQueryRunner(entityURI, dataSource, log); + Model constructedModel = constructQueryRunner.getConstructedModel(); + QueryRunner queryManager = new EntityPublicationCountQueryRunner( - entityURI, dataSource, log); + entityURI, constructedModel, log); Entity entity = queryManager.getQueryResult(); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java new file mode 100644 index 00000000..f50516d0 --- /dev/null +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java @@ -0,0 +1,178 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; + +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.Set; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.hp.hpl.jena.iri.IRI; +import com.hp.hpl.jena.iri.IRIFactory; +import com.hp.hpl.jena.iri.Violation; +import com.hp.hpl.jena.query.DataSource; +import com.hp.hpl.jena.query.Query; +import com.hp.hpl.jena.query.QueryExecution; +import com.hp.hpl.jena.query.QueryExecutionFactory; +import com.hp.hpl.jena.query.QueryFactory; +import com.hp.hpl.jena.query.Syntax; +import com.hp.hpl.jena.rdf.model.Model; +import com.hp.hpl.jena.rdf.model.ModelFactory; + +import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; + +public class EntitySubOrganizationTypesConstructQueryRunner { + + protected static final Syntax SYNTAX = Syntax.syntaxARQ; + + private String egoURI; + + private DataSource dataSource; + + private Log log = LogFactory.getLog(EntitySubOrganizationTypesConstructQueryRunner.class.getName()); + + public EntitySubOrganizationTypesConstructQueryRunner(String egoURI, DataSource dataSource, Log log){ + this.egoURI = egoURI; + this.dataSource = dataSource; + //this.log = log; + } + + private String generateConstructQueryForOrganizationLabel(String queryURI) { + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> rdfs:label ?organizationLabel ." + + "}" + + "WHERE {" + + "<"+queryURI+ "> rdfs:label ?organizationLabel " + + "}"; + return sparqlQuery; + } + + private String generateConstructQueryForSubOrganizationTypes(String queryURI){ + + String sparqlQuery = + + "CONSTRUCT { " + + "<"+queryURI+ "> core:hasSubOrganization ?subOrganization . " + + "?subOrganization rdfs:label ?subOrganizationLabel . " + + "?subOrganization rdf:type ?subOrganizationType . " + + "?subOrganization core:organizationForPosition ?Position . " + + "?subOrganizationType rdfs:label ?subOrganizationTypeLabel . " + + "?Position core:positionForPerson ?Person ." + + "?Person rdfs:label ?PersonLabel ." + + "?Person rdf:type ?PersonType . " + + "?PersonType rdfs:label ?PersonTypeLabel " + +"}" + + "WHERE { " + + "<"+queryURI+ "> core:hasSubOrganization ?subOrganization . " + + "?subOrganization rdfs:label ?subOrganizationLabel . " + + "?subOrganization rdf:type ?subOrganizationType . " + + "?subOrganization core:organizationForPosition ?Position . " + + "?subOrganizationType rdfs:label ?subOrganizationTypeLabel . " + + "?Position core:positionForPerson ?Person " + + "}" ; + + + return sparqlQuery; + + } + + private String generateConstructQueryForPersonTypes(String queryURI){ + + String sparqlQuery = + + "CONSTRUCT { " + + "<"+queryURI+ "> core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person ." + + "?Person rdfs:label ?PersonLabel ." + + "?Person rdf:type ?PersonType . " + + "?PersonType rdfs:label ?PersonTypeLabel " + +"}" + + "WHERE { " + + "<"+queryURI+ "> core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person ." + + "?Person rdfs:label ?PersonLabel ." + + "?Person rdf:type ?PersonType . " + + "?PersonType rdfs:label ?PersonTypeLabel " + + "}" ; + + + return sparqlQuery; + + } + + private Model executeQuery(Set constructQueries, DataSource dataSource) { + + Model constructedModel = ModelFactory.createDefaultModel(); + + for (String queryString : constructQueries) { + + // log.info("CONSTRUCT query string : " + queryString); + + Query query = null; + + try{ + query = QueryFactory.create(QueryConstants.getSparqlPrefixQuery() + queryString, SYNTAX); + }catch(Throwable th){ + log.error("Could not create CONSTRUCT SPARQL query for query " + + "string. " + th.getMessage()); + log.error(queryString); + } + + QueryExecution qe = QueryExecutionFactory.create( + query, dataSource); + try { + qe.execConstruct(constructedModel); + } finally { + qe.close(); + } + + } + + return constructedModel; + } + + public Model getConstructedModel() + throws MalformedQueryParametersException { + + if (StringUtils.isNotBlank(this.egoURI)) { + /* + * To test for the validity of the URI submitted. + * */ + IRIFactory iRIFactory = IRIFactory.jenaImplementation(); + IRI iri = iRIFactory.create(this.egoURI); + if (iri.hasViolation(false)) { + String errorMsg = ((Violation) iri.violations(false).next()).getShortMessage(); + log.error("Ego Co-PI Vis Query " + errorMsg); + throw new MalformedQueryParametersException( + "URI provided for an individual is malformed."); + } + } else { + throw new MalformedQueryParametersException("URI parameter is either null or empty."); + } + + Set constructQueries = new LinkedHashSet(); + + populateConstructQueries(constructQueries); + + Model model = executeQuery(constructQueries, + this.dataSource); + model.write(System.out); + return model; + + } + + private void populateConstructQueries(Set constructQueries) { + + constructQueries.add(generateConstructQueryForOrganizationLabel(this.egoURI)); + constructQueries.add(generateConstructQueryForSubOrganizationTypes(this.egoURI)); + constructQueries.add(generateConstructQueryForPersonTypes(this.egoURI)); + + + } + +} diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesQueryRunner.java index 655664dd..bcd1b8a4 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesQueryRunner.java @@ -20,6 +20,8 @@ import com.hp.hpl.jena.query.QuerySolution; import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.query.Syntax; import com.hp.hpl.jena.rdf.model.RDFNode; +import com.hp.hpl.jena.rdf.model.Model; + import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; @@ -39,7 +41,7 @@ public class EntitySubOrganizationTypesQueryRunner implements QueryRunner rdf:type foaf:Organization ;" - + " rdfs:label ?organizationLabel . " + + "> rdfs:label ?organizationLabel . " + "{ " + "<"+ queryURI + "> core:hasSubOrganization ?subOrganization . " - + "?subOrganization rdfs:label ?subOrganizationLabel ; rdf:type ?subOrganizationType ; core:organizationForPosition ?Position . " + + "?subOrganization rdfs:label ?subOrganizationLabel ; rdf:type ?subOrganizationType ;" + + " core:organizationForPosition ?Position . " + "?subOrganizationType rdfs:label ?subOrganizationTypeLabel . " - + "?Position rdf:type core:Position ; core:positionForPerson ?Person ." + + "?Position core:positionForPerson ?Person ." + "}" + "UNION " + "{ " + "<"+ queryURI + "> core:organizationForPosition ?Position . " - + "?Position rdf:type core:Position ; core:positionForPerson ?Person . " + + "?Position core:positionForPerson ?Person . " + "?Person rdfs:label ?PersonLabel ; rdf:type ?PersonType . " - + "?PersonType rdfs:label ??PersonTypeLabel . " + + "?PersonType rdfs:label ?PersonTypeLabel . " + "}" + "}"; - log.debug("\nThe sparql query is :\n" + sparqlQuery); + log.info("\n SubOrganizationTypesQuery :" + sparqlQuery); return sparqlQuery; @@ -105,8 +107,8 @@ public class EntitySubOrganizationTypesQueryRunner implements QueryRunner> createJavaValueObjects(ResultSet resultSet) { - /*Map> subOrganizationLabelToTypes = new HashMap>(); - Map> personLabelToTypes = new HashMap>();*/ + // Map> subOrganizationLabelToTypes = new HashMap>(); + // Map> personLabelToTypes = new HashMap>(); Map> subEntityLabelToTypes = new HashMap>(); while(resultSet.hasNext()){ diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountConstructQueryRunner.java new file mode 100644 index 00000000..ef98530f --- /dev/null +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountConstructQueryRunner.java @@ -0,0 +1,342 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitygrantcount; + +import java.util.LinkedHashSet; +import java.util.Set; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.hp.hpl.jena.iri.IRI; +import com.hp.hpl.jena.iri.IRIFactory; +import com.hp.hpl.jena.iri.Violation; +import com.hp.hpl.jena.query.DataSource; +import com.hp.hpl.jena.query.Query; +import com.hp.hpl.jena.query.QueryExecution; +import com.hp.hpl.jena.query.QueryExecutionFactory; +import com.hp.hpl.jena.query.QueryFactory; +import com.hp.hpl.jena.query.Syntax; +import com.hp.hpl.jena.rdf.model.Model; +import com.hp.hpl.jena.rdf.model.ModelFactory; + +import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; + +public class EntityGrantCountConstructQueryRunner { + + protected static final Syntax SYNTAX = Syntax.syntaxARQ; + + private String egoURI; + + private DataSource dataSource; + + private Log log = LogFactory.getLog(EntityGrantCountConstructQueryRunner.class.getName()); + + public EntityGrantCountConstructQueryRunner(String egoURI, DataSource dataSource, Log log){ + this.egoURI = egoURI; + this.dataSource = dataSource; + //this.log = log; + } + + private String generateConstructQueryForOrganizationLabel(String queryURI) { + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> rdfs:label ?organizationLabel ." + + "}" + + "WHERE {" + + "<"+queryURI+ "> rdfs:label ?organizationLabel " + + "}"; + + return sparqlQuery; + } + + private String generateConstructQueryForDateTimeValueofRoleForOneLevelDeep(String queryURI){ + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> core:hasSubOrganization ?subOrganization . " + + "?subOrganization core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person ?preboundProperty ?Role . " + + "?Role core:dateTimeInterval ?dateTimeIntervalValue . " + + "?dateTimeIntervalValue core:start ?startDate . " + + "?startDate core:dateTime ?startDateTimeValue . " + + "?dateTimeIntervalValue core:end ?endDate . " + + "?endDate core:dateTime ?endDateTimeValue . " + + "}" + + "WHERE { " + + "{" + + "<"+queryURI+ "> core:hasSubOrganization ?subOrganization . " + + "?subOrganization core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person ?preboundProperty ?Role . " + + "?Role core:dateTimeInterval ?dateTimeIntervalValue . " + + "?dateTimeIntervalValue core:start ?startDate . " + + "?startDate core:dateTime ?startDateTimeValue . " + + "} UNION " + + "{" + + "<"+queryURI+ "> core:hasSubOrganization ?subOrganization . " + + "?subOrganization core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person ?preboundProperty ?Role . " + + "?Role core:dateTimeInterval ?dateTimeIntervalValue . " + + "?dateTimeIntervalValue core:end ?endDate . " + + "?endDate core:dateTime ?endDateTimeValue . " + + "}" + + "}"; + + return sparqlQuery; + } + + private String generateConstructQueryForDateTimeValueofGrantForOneLevelDeep(String queryURI){ + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> core:hasSubOrganization ?subOrganization . " + + "?subOrganization core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant core:dateTimeInterval ?dateTimeIntervalValueForGrant . " + + "?dateTimeIntervalValueForGrant core:start ?startDateForGrant . " + + "?startDateForGrant core:dateTime ?startDateTimeValueForGrant . " + + "?dateTimeIntervalValueForGrant core:end ?endDateForGrant . " + + "?endDateForGrant core:dateTime ?endDateTimeValueForGrant " + + "}" + + "WHERE { " + + "{" + + "<"+queryURI+ "> core:hasSubOrganization ?subOrganization . " + + "?subOrganization core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant core:dateTimeInterval ?dateTimeIntervalValueForGrant . " + + "?dateTimeIntervalValueForGrant core:start ?startDateForGrant . " + + "?startDateForGrant core:dateTime ?startDateTimeValueForGrant " + + "} UNION " + + "{" + + "<"+queryURI+ "> core:hasSubOrganization ?subOrganization . " + + "?subOrganization core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant core:dateTimeInterval ?dateTimeIntervalValueForGrant . " + + "?dateTimeIntervalValueForGrant core:end ?endDateForGrant . " + + "?endDateForGrant core:dateTime ?endDateTimeValueForGrant " + + "}" + + "}"; + + return sparqlQuery; + } + + private String generateConstructQueryForDateTimeValueofRole(String queryURI){ + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person ?preboundProperty ?Role . " + + "?Role core:dateTimeInterval ?dateTimeIntervalValue . " + + "?dateTimeIntervalValue core:start ?startDate . " + + "?startDate core:dateTime ?startDateTimeValue . " + + "?dateTimeIntervalValue core:end ?endDate . " + + "?endDate core:dateTime ?endDateTimeValue " + + "}" + + "WHERE { " + + "{" + + "<"+queryURI+ "> core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person ?preboundProperty ?Role . " + + "?Role core:dateTimeInterval ?dateTimeIntervalValue . " + + "?dateTimeIntervalValue core:start ?startDate . " + + "?startDate core:dateTime ?startDateTimeValue " + + "} UNION " + + "{" + + "<"+queryURI+ "> core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person ?preboundProperty ?Role . " + + "?Role core:dateTimeInterval ?dateTimeIntervalValue . " + + "?dateTimeIntervalValue core:end ?endDate . " + + "?endDate core:dateTime ?endDateTimeValue " + + "}" + + "}"; + + return sparqlQuery; + } + + private String generateConstructQueryForDateTimeValueofGrant(String queryURI){ + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant core:dateTimeInterval ?dateTimeIntervalValueForGrant . " + + "?dateTimeIntervalValueForGrant core:start ?startDateForGrant . " + + "?startDateForGrant core:dateTime ?startDateTimeValueForGrant . " + + "?dateTimeIntervalValueForGrant core:end ?endDateForGrant . " + + "?endDateForGrant core:dateTime ?endDateTimeValueForGrant " + + "}" + + "WHERE { " + + "{" + + "<"+queryURI+ "> core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant core:dateTimeInterval ?dateTimeIntervalValueForGrant . " + + "?dateTimeIntervalValueForGrant core:start ?startDateForGrant . " + + "?startDateForGrant core:dateTime ?startDateTimeValueForGrant " + + "} UNION " + + "{" + + "<"+queryURI+ "> core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant core:dateTimeInterval ?dateTimeIntervalValueForGrant . " + + "?dateTimeIntervalValueForGrant core:end ?endDateForGrant . " + + "?endDateForGrant core:dateTime ?endDateTimeValueForGrant " + + "}" + + "}"; + + return sparqlQuery; + } + + private String generateConstructQueryForSubOrganizations(String queryURI){ + + String sparqlQuery = + + "CONSTRUCT { " + + "<"+queryURI+ "> core:hasSubOrganization ?subOrganization . " + + "?subOrganization rdfs:label ?subOrganizationLabel . " + + "?subOrganization core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person rdfs:label ?PersonLabel ." + + "?Person ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant rdfs:label ?GrantLabel " + +"}" + + "WHERE { " + + "<"+queryURI+ "> core:hasSubOrganization ?subOrganization . " + + "?subOrganization rdfs:label ?subOrganizationLabel . " + + "?subOrganization core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person rdfs:label ?PersonLabel ." + + "?Person ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant rdfs:label ?GrantLabel " + + "}" ; + + + return sparqlQuery; + + } + + private String generateConstructQueryForPersons(String queryURI){ + + String sparqlQuery = + + "CONSTRUCT { " + + "<"+queryURI+ "> core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person rdfs:label ?PersonLabel ." + + "?Person ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant rdfs:label ?GrantLabel " + +"}" + + "WHERE { " + + "<"+queryURI+ "> core:organizationForPosition ?Position . " + + "?Position core:positionForPerson ?Person . " + + "?Person rdfs:label ?PersonLabel ." + + "?Person ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant rdfs:label ?GrantLabel " + + "}" ; + + + return sparqlQuery; + + } + + + + private Model executeQuery(Set constructQueries, DataSource dataSource) { + + Model constructedModel = ModelFactory.createDefaultModel(); + + for (String queryString : constructQueries) { + + log.debug("CONSTRUCT query string : " + queryString); + + Query query = null; + + try{ + query = QueryFactory.create(QueryConstants.getSparqlPrefixQuery() + queryString, SYNTAX); + // log.info("query: "+ queryString); + }catch(Throwable th){ + log.error("Could not create CONSTRUCT SPARQL query for query " + + "string. " + th.getMessage()); + log.error(queryString); + } + + QueryExecution qe = QueryExecutionFactory.create( + query, dataSource); + try { + qe.execConstruct(constructedModel); + } finally { + qe.close(); + } + + } + log.debug("Statements for constructed model of EntityGrantCount : "+ constructedModel.listStatements().toString()); + // constructedModel.write(System.out); + return constructedModel; + } + + public Model getConstructedModel() + throws MalformedQueryParametersException { + + if (StringUtils.isNotBlank(this.egoURI)) { + /* + * To test for the validity of the URI submitted. + * */ + IRIFactory iRIFactory = IRIFactory.jenaImplementation(); + IRI iri = iRIFactory.create(this.egoURI); + if (iri.hasViolation(false)) { + String errorMsg = ((Violation) iri.violations(false).next()).getShortMessage(); + log.error("Entity Grant Count Construct Query " + errorMsg); + throw new MalformedQueryParametersException( + "URI provided for an individual is malformed."); + } + } else { + throw new MalformedQueryParametersException("URI parameter is either null or empty."); + } + + Set constructQueries = new LinkedHashSet(); + + populateConstructQueries(constructQueries); + + Model model = executeQuery(constructQueries, + this.dataSource); + + return model; + + } + + private void populateConstructQueries(Set constructQueries) { + + constructQueries.add(generateConstructQueryForOrganizationLabel(this.egoURI)); + constructQueries.add(generateConstructQueryForSubOrganizations(this.egoURI)); + constructQueries.add(generateConstructQueryForPersons(this.egoURI)); + constructQueries.add(generateConstructQueryForDateTimeValueofRoleForOneLevelDeep(this.egoURI)); + constructQueries.add(generateConstructQueryForDateTimeValueofRole(this.egoURI)); + constructQueries.add(generateConstructQueryForDateTimeValueofGrantForOneLevelDeep(this.egoURI)); + constructQueries.add(generateConstructQueryForDateTimeValueofGrant(this.egoURI)); + + + } + +} diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java index 91bc36e1..3485f267 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java @@ -20,13 +20,14 @@ import com.hp.hpl.jena.query.QueryFactory; import com.hp.hpl.jena.query.QuerySolution; import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.query.Syntax; +import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Grant; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; @@ -44,7 +45,7 @@ public class EntityGrantCountQueryRunner implements QueryRunner { protected static final Syntax SYNTAX = Syntax.syntaxARQ; private String entityURI; - private DataSource dataSource; + private Model dataSource; private Log log = LogFactory.getLog(EntityGrantCountQueryRunner.class.getName()); @@ -54,7 +55,6 @@ public class EntityGrantCountQueryRunner implements QueryRunner { + " (str(?subOrganizationLabel) as ?subOrganizationLabelLit) " + " (str(?Person) as ?personLit) " + " (str(?PersonLabel) as ?personLabelLit) " - + " (str(?SecondaryPositionLabel) as ?SecondaryPositionLabelLit)" + " (str(?Grant) as ?grantLit) " + " (str(?GrantLabel) as ?grantLabelLit) " + " (str(?startDateTimeValue) as ?grantStartDateLit) " @@ -63,7 +63,6 @@ public class EntityGrantCountQueryRunner implements QueryRunner { + " (str(?endDateTimeValueForGrant) as ?grantEndDateForGrantLit) " ; private static final String SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_ROLE_DATE_TIME = " " - + " ?SecondaryPosition rdfs:label ?SecondaryPositionLabel . " + " ?Role core:roleIn ?Grant . " + " ?Grant rdfs:label ?GrantLabel . " + "OPTIONAL {" @@ -77,7 +76,6 @@ public class EntityGrantCountQueryRunner implements QueryRunner { + "}" ; private static final String SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_GRANT_DATE_TIME = " " - + " ?SecondaryPosition rdfs:label ?SecondaryPositionLabel . " + " ?Role core:roleIn ?Grant . " + " ?Grant rdfs:label ?GrantLabel . " + "OPTIONAL {" @@ -98,22 +96,22 @@ public class EntityGrantCountQueryRunner implements QueryRunner { public EntityGrantCountQueryRunner(String entityURI, - DataSource dataSource, Log log) { + Model constructedModel, Log log) { this.entityURI = entityURI; - this.dataSource = dataSource; + this.dataSource = constructedModel; } private Entity createJavaValueObjects(ResultSet resultSet) { - + Entity entity = null; Map grantURIToVO = new HashMap(); Map subentityURLToVO = new HashMap(); Map personURLToVO = new HashMap(); while (resultSet.hasNext()) { - + // log.info("Checking whether EntityGrantCount produced any resultset against the Constructed Model"); QuerySolution solution = resultSet.nextSolution(); if (entity == null) { @@ -196,10 +194,8 @@ public class EntityGrantCountQueryRunner implements QueryRunner { person = new SubEntity(personURLNode.toString()); personURLToVO.put(personURLNode.toString(), person); } - - RDFNode personLabelNode = solution - .get(QueryFieldLabels.PERSON_LABEL); + RDFNode personLabelNode = solution.get(QueryFieldLabels.PERSON_LABEL); if (personLabelNode != null) { person.setIndividualLabel(personLabelNode.toString()); } @@ -235,12 +231,12 @@ public class EntityGrantCountQueryRunner implements QueryRunner { return entity; } - private ResultSet executeQuery(String queryURI, DataSource dataSource) { + private ResultSet executeQuery(String queryURI, Model dataSource2) { QueryExecution queryExecution = null; Query query = QueryFactory.create( getSparqlQuery(queryURI), SYNTAX); - queryExecution = QueryExecutionFactory.create(query, dataSource); + queryExecution = QueryExecutionFactory.create(query, dataSource2); return queryExecution.execSelect(); } @@ -249,57 +245,56 @@ public class EntityGrantCountQueryRunner implements QueryRunner { String sparqlQuery = QueryConstants.getSparqlPrefixQuery() + SPARQL_QUERY_COMMON_SELECT_CLAUSE + " (str(<" + queryURI + ">) as ?" + ENTITY_URL + ") " - + "WHERE { " + "<" + queryURI + "> rdf:type foaf:Organization ;" - + " rdfs:label ?organizationLabel ." + + "WHERE { " + "<" + queryURI + "> rdfs:label ?organizationLabel ." + "{ " + "<" + queryURI + "> core:hasSubOrganization ?subOrganization ." + " ?subOrganization rdfs:label ?subOrganizationLabel ; core:organizationForPosition ?Position . " - + " ?Position rdf:type core:Position ; core:positionForPerson ?Person ." - + " ?Person core:hasCo-PrincipalInvestigatorRole ?Role ; rdfs:label ?PersonLabel ; core:personInPosition ?SecondaryPosition . " + + " ?Position core:positionForPerson ?Person ." + + " ?Person core:hasCo-PrincipalInvestigatorRole ?Role ; rdfs:label ?PersonLabel ." + SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_ROLE_DATE_TIME + SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_GRANT_DATE_TIME + "}" + "UNION " + "{ " + "<" + queryURI + "> core:hasSubOrganization ?subOrganization . " + " ?subOrganization rdfs:label ?subOrganizationLabel ; core:organizationForPosition ?Position . " - + " ?Position rdf:type core:Position ; core:positionForPerson ?Person ." - + " ?Person core:hasPrincipalInvestigatorRole ?Role ; rdfs:label ?PersonLabel ; core:personInPosition ?SecondaryPosition . " + + " ?Position core:positionForPerson ?Person ." + + " ?Person core:hasPrincipalInvestigatorRole ?Role ; rdfs:label ?PersonLabel . " + SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_ROLE_DATE_TIME + SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_GRANT_DATE_TIME + "}" + "UNION " + "{ " + "<" + queryURI + "> core:hasSubOrganization ?subOrganization . " + " ?subOrganization rdfs:label ?subOrganizationLabel ; core:organizationForPosition ?Position . " - + " ?Position rdf:type core:Position ; core:positionForPerson ?Person ." - + " ?Person core:hasInvestigatorRole ?Role ; rdfs:label ?PersonLabel ; core:personInPosition ?SecondaryPosition . " + + " ?Position core:positionForPerson ?Person ." + + " ?Person core:hasInvestigatorRole ?Role ; rdfs:label ?PersonLabel . " + SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_ROLE_DATE_TIME + SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_GRANT_DATE_TIME + "}" + "UNION " + "{ " + "<" + queryURI + "> core:organizationForPosition ?Position . " - + " ?Position rdf:type core:Position ; core:positionForPerson ?Person ." - + " ?Person core:hasCo-PrincipalInvestigatorRole ?Role ; rdfs:label ?PersonLabel ; core:personInPosition ?SecondaryPosition . " + + " ?Position core:positionForPerson ?Person ." + + " ?Person core:hasCo-PrincipalInvestigatorRole ?Role ; rdfs:label ?PersonLabel . " + SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_ROLE_DATE_TIME + SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_GRANT_DATE_TIME + "}" + "UNION " + "{ " + "<" + queryURI + "> core:organizationForPosition ?Position . " - + " ?Position rdf:type core:Position ; core:positionForPerson ?Person ." - + " ?Person core:hasPrincipalInvestigatorRole ?Role ; rdfs:label ?PersonLabel ; core:personInPosition ?SecondaryPosition . " + + " ?Position core:positionForPerson ?Person ." + + " ?Person core:hasPrincipalInvestigatorRole ?Role ; rdfs:label ?PersonLabel . " + SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_ROLE_DATE_TIME + SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_GRANT_DATE_TIME + "}" + "UNION " + "{ " + "<" + queryURI + "> core:organizationForPosition ?Position . " - + " ?Position rdf:type core:Position ; core:positionForPerson ?Person ." - + " ?Person core:hasInvestigatorRole ?Role ; rdfs:label ?PersonLabel ; core:personInPosition ?SecondaryPosition . " + + " ?Position core:positionForPerson ?Person ." + + " ?Person core:hasInvestigatorRole ?Role ; rdfs:label ?PersonLabel . " + SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_ROLE_DATE_TIME + SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_GRANT_DATE_TIME + "}" + " } "; //System.out.println("\n\nEntity Grant Count query is: "+ sparqlQuery); - log.debug("\nThe sparql query is :\n" + sparqlQuery); + // log.info("\nThe sparql query is :\n" + sparqlQuery); return sparqlQuery; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java index 63e74d82..6199fc0d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java @@ -12,12 +12,14 @@ import java.util.Set; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import com.google.gson.Gson; import com.hp.hpl.jena.iri.IRI; import com.hp.hpl.jena.iri.IRIFactory; import com.hp.hpl.jena.iri.Violation; import com.hp.hpl.jena.query.DataSource; +import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.beans.Portal; @@ -40,6 +42,8 @@ import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.Visual public class EntityGrantCountRequestHandler implements VisualizationRequestHandler { + private Log log = LogFactory.getLog(EntityGrantCountRequestHandler.class.getName()); + @Override public ResponseValues generateStandardVisualization( VitroRequest vitroRequest, Log log, DataSource dataSource) @@ -100,8 +104,11 @@ public class EntityGrantCountRequestHandler implements String entityURI = vitroRequest .getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY); + EntityGrantCountConstructQueryRunner constructQueryRunner = new EntityGrantCountConstructQueryRunner(entityURI, dataSource, log); + Model constructedModel = constructQueryRunner.getConstructedModel(); + QueryRunner queryManager = new EntityGrantCountQueryRunner( - entityURI, dataSource, log); + entityURI, constructedModel, log); Entity entity = queryManager.getQueryResult(); @@ -124,8 +131,11 @@ public class EntityGrantCountRequestHandler implements String subjectEntityURI) throws MalformedQueryParametersException { + EntityGrantCountConstructQueryRunner constructQueryRunner = new EntityGrantCountConstructQueryRunner(subjectEntityURI, dataSource, log); + Model constructedModel = constructQueryRunner.getConstructedModel(); + QueryRunner queryManager = new EntityGrantCountQueryRunner( - subjectEntityURI, dataSource, log); + subjectEntityURI, constructedModel, log); Entity entity = queryManager.getQueryResult(); @@ -269,6 +279,8 @@ public class EntityGrantCountRequestHandler implements yearGrantCount.add(currentGrantYear); } + log.info("entityJson.getLabel() : " + entityJson.getLabel() + " subOrganizationTypesResult " + subOrganizationTypesResult.toString()); + entityJson.setYearToActivityCount(yearGrantCount); entityJson.getOrganizationType().addAll(subOrganizationTypesResult.get(entityJson.getLabel())); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java index 663665f8..02af6037 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java @@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import com.hp.hpl.jena.query.DataSource; +import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -22,6 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.Visu import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coauthorship.CoAuthorshipQueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coauthorship.CoAuthorshipVisCodeGenerator; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator.CoPIGrantCountConstructQueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator.CoPIGrantCountQueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator.CoPIVisCodeGenerator; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.persongrantcount.PersonGrantCountQueryRunner; @@ -82,10 +84,13 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler { VisualizationFrameworkConstants.VIS_MODE_KEY); - if (VisualizationFrameworkConstants.COPI_VIS_MODE.equalsIgnoreCase(visMode)) { + if (VisualizationFrameworkConstants.COPI_VIS_MODE.equalsIgnoreCase(visMode)){ - QueryRunner coPIQueryManager = new CoPIGrantCountQueryRunner(egoURI, dataSource, log); - + CoPIGrantCountConstructQueryRunner constructQueryRunner = new CoPIGrantCountConstructQueryRunner(egoURI, dataSource, log); + Model constructedModel = constructQueryRunner.getConstructedModel(); + + QueryRunner coPIQueryManager = new CoPIGrantCountQueryRunner(egoURI, constructedModel, log); + QueryRunner> grantQueryManager = new PersonGrantCountQueryRunner(egoURI, dataSource, log); CoPIData coPIData = coPIQueryManager.getQueryResult(); From 5593b4a7a6b8e6fe66a5449e8e5356fe19805140 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Tue, 8 Feb 2011 22:00:23 +0000 Subject: [PATCH 374/427] Holly did more finalization of test cases as needed. --- .../CheckBrowseOptions.html | 44 +++++++++---------- .../VerifyAllThingsSearchable.html | 14 +++--- .../DeleteTestFaculty.html | 9 +--- .../TestTemporalGraphs.html | 23 ++++------ .../TestTemporalGraphs.html | 33 ++++++-------- .../CreatePeople/AssociateLibToFac.html | 5 +++ 6 files changed, 59 insertions(+), 69 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html index b0cdc94a..74f2fa83 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html @@ -121,12 +121,12 @@ verifyTextPresent - Faculty Member (1) + Faculty Member verifyTextPresent - Librarian (1) + Librarian @@ -146,12 +146,12 @@ verifyTextPresent - Agreement (3) + Agreement verifyTextPresent - Service (1) + Service @@ -171,7 +171,7 @@ verifyTextPresent - Course (1) + Course @@ -191,17 +191,17 @@ verifyTextPresent - Conference (1) + Conference verifyTextPresent - Invited Talk (1) + Invited Talk verifyTextPresent - Presentation (1) + Presentation @@ -221,22 +221,22 @@ verifyTextPresent - College (1) + College verifyTextPresent - Consortium (1) + Consortium verifyTextPresent - Laboratory (1) + Laboratory verifyTextPresent - Library (1) + Library @@ -256,7 +256,7 @@ verifyTextPresent - Equipment (2) + Equipment @@ -276,32 +276,32 @@ verifyTextPresent - Book (1) + Book verifyTextPresent - Database (1) + Database verifyTextPresent - Grant (3) + Grant verifyTextPresent - Proceedings (1) + Proceedings verifyTextPresent - Subject Area (4) + Subject Area verifyTextPresent - Webpage (1) + Webpage @@ -321,17 +321,17 @@ verifyTextPresent - Building (1) + Building verifyTextPresent - Country (207) + Country verifyTextPresent - Room (1) + Room diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html index 612eca93..3d7c32d2 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html @@ -224,6 +224,11 @@ Primate Elderly Care + + verifyTextPresent + Jane Memorial Building + + verifyTextPresent http://primatehealthintro.cornell.edu @@ -234,11 +239,6 @@ Elderly Care - - verifyTextPresent - Primate Health Conference - - clickAndWait link=Next @@ -261,12 +261,12 @@ verifyTextPresent - Jane Memorial Building + Not sure verifyTextPresent - Not sure + Primate Health Conference diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html index 8e349808..3d9edd16 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteTestFaculty.html @@ -89,11 +89,6 @@ loginForm - - assertTitle - VIVO Site Administration - - comment Navigate to index @@ -106,7 +101,7 @@ assertTitle - Index to VIVO Contents + Index of Contents @@ -211,7 +206,7 @@ assertTitle - Index to VIVO Contents + Index of Contents diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html index a3707b82..04b0fe42 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html @@ -311,7 +311,7 @@ assertTitle - Temporal Graph Visualization + Child Development - Temporal Graph Visualization @@ -324,11 +324,6 @@ How do you want to compare? - - assertTitle - Temporal Graph Visualization - - verifyTextPresent Who do you want to compare? @@ -556,7 +551,7 @@ assertTitle - Temporal Graph Visualization + Child Development - Temporal Graph Visualization @@ -734,6 +729,11 @@ link=Zink, Zoe + + pause 5000 + + + comment Make dept sub-org of a college @@ -841,7 +841,7 @@ assertTitle - Temporal Graph Visualization + College of Human Ecology - Temporal Graph Visualization @@ -854,11 +854,6 @@ How do you want to compare? - - assertTitle - Temporal Graph Visualization - - verifyTextPresent Who do you want to compare? @@ -986,7 +981,7 @@ assertTitle - Temporal Graph Visualization + College of Human Ecology - Temporal Graph Visualization diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/TestTemporalGraphs.html index 5fdf2528..6040f297 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/TestTemporalGraphs.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/TestTemporalGraphs.html @@ -294,6 +294,11 @@ Department + + pause + 5000 + + clickAndWait link=Child Development @@ -311,7 +316,7 @@ assertTitle - Temporal Graph Visualization + Child Development - Temporal Graph Visualization @@ -324,11 +329,6 @@ How do you want to compare? - - assertTitle - Temporal Graph Visualization - - verifyTextPresent Who do you want to compare? @@ -556,7 +556,7 @@ assertTitle - Temporal Graph Visualization + Child Development - Temporal Graph Visualization @@ -734,6 +734,11 @@ link=Zink, Zoe + + pause + 5000 + + comment Make dept sub-org of a college @@ -744,11 +749,6 @@ link=Site Admin - - pause - 5000 - - assertTitle VIVO Site Administration @@ -851,7 +851,7 @@ assertTitle - Temporal Graph Visualization + College of Human Ecology - Temporal Graph Visualization @@ -864,11 +864,6 @@ How do you want to compare? - - assertTitle - Temporal Graph Visualization - - verifyTextPresent Who do you want to compare? @@ -996,7 +991,7 @@ assertTitle - Temporal Graph Visualization + College of Human Ecology - Temporal Graph Visualization diff --git a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html index 3d5cff7d..98fbf18b 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html @@ -149,6 +149,11 @@ SuperclassURI label=core:Faculty Member + + select + SubclassURI + label=core:Librarian + clickAndWait primaryAction From 1f92138ee9c08e159f9942d17185782dce8fce6f Mon Sep 17 00:00:00 2001 From: sjm222 Date: Tue, 8 Feb 2011 22:05:31 +0000 Subject: [PATCH 375/427] NIHVIVO-2067 remove core:dateTimeIntervalFor object property from the ontology and delete core:offersCourse assertions during the migration. --- .../WEB-INF/filegraph/tbox/scires-1.2.owl | 12 +- .../WEB-INF/filegraph/tbox/vivo-core-1.2.owl | 2404 ++++++++--------- .../WEB-INF/ontologies/update/diff.tab.txt | 2 +- .../user/vivo-core-1.2-annotations.rdf | 43 +- productMods/WEB-INF/submodels/scires-1.2.owl | 12 +- .../WEB-INF/submodels/vivo-core-1.2.owl | 2404 ++++++++--------- 6 files changed, 2430 insertions(+), 2447 deletions(-) diff --git a/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl b/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl index 20405ecb..f3d89731 100644 --- a/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl +++ b/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl @@ -13,6 +13,11 @@ xmlns:j.5="http://purl.org/dc/terms/" xmlns:xsd="http://www.w3.org/2001/XMLSchema#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > + + + + + @@ -29,9 +34,9 @@ An implement used to facilitate work, especially precision work. - An implement used to facilitate work, especially precision work. + A plan specification that allows different domain experts to reliably and independently reproduce a process. @@ -64,11 +69,6 @@ - - - - - diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl index c678b1ab..7d9ff778 100644 --- a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl +++ b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl @@ -25,6 +25,16 @@ A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available in PubMed Central. The PMCID is issued shortly after the PI or author approves the PubMed Central formatted web version of the submission. + + + + + + + + + + http://purl.org/ontology/bibo/ Short Definition from bibo ontology @@ -34,19 +44,14 @@ Notes or annotations about a resource stable - - - 1 - - - + + + - - @@ -59,6 +64,11 @@ + + + + + @@ -72,14 +82,14 @@ An organized series of a meeting for an exchange of ideas, typically put on by a department or center. + + + + + - - - - - unstable @@ -95,30 +105,25 @@ + + + 1 + + A person who is enrolled in an educational institution. Use only if no specific subclasses of core:Student describe the person. - - - - - - + UN Cartographic Section UN Cartographic Section - + - - - - - - + @@ -126,10 +131,15 @@ - - + - + + + + + + + @@ -140,9 +150,9 @@ Accounting & Research Services Assistant; Director of Information Technology Staff, support, and other non-academic positions. - - + A position classified as professional, staff, support, or any other non-academic role + @@ -157,6 +167,11 @@ Serial Item and Contribution Identifier + + + + + @@ -166,6 +181,11 @@ + + + + + Definition take from: http://en.wikipedia.org/wiki/Government_agency. United States Library of Congress @@ -173,11 +193,6 @@ A government agency is a permanent or semi-permanent organization in the machinery of government that is responsible for the oversight and administration of specific functions. - - - - - @@ -185,10 +200,10 @@ Public description modified from the information on this page: http://www.w3.org/TR/2005/WD-swbp-skos-core-guide-20050510/#sechierarchy . - - + + - + @@ -219,44 +234,49 @@ - - - 1 - - Definition take from: http://xmlns.com/foaf/spec/#term_based_near . foaf indicates that the status of this term is "unstable". "The based_near relationship relates two "spatial things" (anything that can be somewhere), the latter typically described using the geo:lat / geo:long geo-positioning vocabulary (http://www.w3.org/2003/01/geo/wgs84_pos#). This allows us to say describe the typical latitute and longitude of, say, a Person (people are spatial things - they can be places) without implying that a precise location has been given." Used to link an agent, related to bibliographic things, to a place where it is based near: can be a city, a monument, a building, etc. + + + + + Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - + - 1 - + + - - The most general classification of a person - - + The most general classification of a person - + + + + - - - + + 1 + + + + + 1 + http://purl.org/ontology/bibo/ @@ -271,26 +291,31 @@ - - - - - - + - 1 - + + - + - 1 - + + + + + + + + + + + + @@ -300,10 +325,20 @@ http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - + - - + 1 + + + + + + + + + + 1 + @@ -319,16 +354,16 @@ Encompasses talk, speech, lecture, slide lecture, conference presentation - - - 1 - - + + + + + @@ -344,67 +379,77 @@ - - - - - - - - - - + + - - + - - + + + + + + + + + + + - + - - + + - + - - + + - - - + + + - - - + + + + + + + + + + + + 1 + @@ -423,6 +468,11 @@ + + + + + http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -436,9 +486,9 @@ http://www.fao.org/termportal/contr/fr/ FAO terminology - + - + @@ -468,30 +518,35 @@ - + - - + + - + + + + + + + + - - Audiovisual recording in video format - + - 1 - + 1 + - + - - + + @@ -502,33 +557,23 @@ http://purl.org/ontology/bibo/ something that is printed or published and distributed, esp. a given number of a periodical - + + + - - - - - - 1 - - - - - - An explicit individual period considered by an academic institution to be its primary academic cycle. - + + + - - @@ -549,6 +594,11 @@ + + + + + UN Statistics Division http://unstats.un.org/unsd/methods/m49/m49alpha.htm @@ -559,10 +609,15 @@ UN Statistics Division - + + - 1 - + + + + + + http://faostat.fao.org @@ -574,19 +629,29 @@ http://faostat.fao.org/default.aspx?lang=es FAOSTAT http://faostat.fao.org - + + + + + + + + + + + - + - - + 1 + Currently being used by a restriction on organization. @@ -594,16 +659,21 @@ - + - - + + A short written piece focused on an event or announcement of note, having a defined publication time and of less enduring interest than a news feature. + + + + + @@ -632,16 +702,11 @@ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.iso.org/iso/fr/country_codes/iso_3166_code_lists.htm - - - - - - + Authorship of journal articles, books and other original works is a means by which academics communicate the results of their scholarly work, establish priority for their discoveries, and build their reputation among their peers. This class allows for linking an author to a publication while indicating information about that author's authorship. Contains the authors name, their rank in the publication, and whether or not they are a corresponding author on the publication. @@ -655,25 +720,30 @@ This class allows for linking an author to a publication while indicating inform Bibo Definition: A seminar, discussion group, or the like, that emphasizes exchange of ideas and the demonstration and application of techniques, skills, etc. - + - - + + - + 1 - + - + - - + 1 + - + - - + + + + + + 1 + @@ -692,23 +762,18 @@ This class allows for linking an author to a publication while indicating inform stable - - - 1 - - - + Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio Independent organizations formally working together toward a common goal, under an expressed agreement - + - + - - + 1 + @@ -716,31 +781,21 @@ This class allows for linking an author to a publication while indicating inform - - - - - + - - + A group of related documents issued at regular intervals. + http://purl.org/ontology/bibo/ - stable - + - + - - - - - - - + 1 + @@ -770,6 +825,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + A large contiguous landmass that is at least partially surrounded by water, together with any islands on its continental shelf. @@ -777,16 +837,21 @@ This class allows for linking an author to a publication while indicating inform Short Definition take from http://en.wiktionary.org/wiki/continent. - + - 1 - + + + + + + + http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/en/ @@ -800,10 +865,15 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ 2010-06-24 - + + + + + + 1 - + @@ -811,16 +881,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - - - - - - This is done through a restriction on the foaf:Person class. @@ -835,23 +895,28 @@ This class allows for linking an author to a publication while indicating inform + + + + + - - - - - This is done through a restriction on the foaf:Person class. + + + + + @@ -901,6 +966,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + A unit devoted primarily to extension activities, whether for outreach or research. @@ -927,19 +997,19 @@ This class allows for linking an author to a publication while indicating inform - - - + + + - - - + + 1 + - + - - + 1 + @@ -950,11 +1020,6 @@ This class allows for linking an author to a publication while indicating inform A legal decision that affirms a ruling. - - - - - @@ -973,20 +1038,15 @@ This class allows for linking an author to a publication while indicating inform - + + + + + + - - - - - - - - - - - + @@ -995,6 +1055,11 @@ This class allows for linking an author to a publication while indicating inform Regularly updated online journal or newsletter by one or more writers, called bloggers, containing articles and commentary of interest to the blogger + + + 1 + + @@ -1014,10 +1079,10 @@ This class allows for linking an author to a publication while indicating inform Public Description from source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers the bibo:presents and the bibo:presentedAt unstable terms. It also indicates that bibo:presents is a sub-property of event:product. - - + - + 1 + 2010-06-24 @@ -1033,11 +1098,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/es/ - - - 1 - - @@ -1055,10 +1115,10 @@ This class allows for linking an author to a publication while indicating inform Either city or town - a thickly populated area having fixed boundaries and certain local powers of government. - - - + + 1 + @@ -1070,25 +1130,20 @@ This class allows for linking an author to a publication while indicating inform That is a position held by an academic faculty member who works for administration. + + Associate Dean - An academic administrative position (associate dean, etc.) as distinct from a professional administrative position (non-academic) - - + server; Bruker Vector-33 FT-IR - - A network server is one example. Medical schools and research laboratories can list professional equipment, such as microscopes. + A physical object provided for specific purpose, task or occupation. - - - - - + @@ -1103,20 +1158,20 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ A specific journal article + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a periodical or book - Short Definition modified from the bibo ontology. + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine. - stable - + - - + Director of Admissions and Placement; Associate University Librarian Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. + An employment activity, whether compensated or not. Short definition comes from http://en.wikipedia.org/wiki/Position, and has been modified. @@ -1125,16 +1180,21 @@ This class allows for linking an author to a publication while indicating inform - - - - - + + + 1 + + + + + + + The thesis degree. @@ -1146,9 +1206,9 @@ This class allows for linking an author to a publication while indicating inform The source of the public description and this info is found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html. Bibo considers this term "unstable". The bibo editorial note is: "We are not defining, using an enumeration, the range of the bibo:degree to the defined list of bibo:ThesisDegree. We won't do it because we want people to be able to define new degress if needed by some special usecases. Creating such an enumeration would restrict this to happen." - + An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials @@ -1163,15 +1223,15 @@ This class allows for linking an author to a publication while indicating inform + + + + + - - - - - Relates a document to an event; for example, a paper to a conference. @@ -1195,6 +1255,11 @@ This class allows for linking an author to a publication while indicating inform 2009-04-30 http://faostat.fao.org/DesktopDefault.aspx?PageID=377&lang=es#ancor + + + + + Public Definition source (http://www.answers.com/topic/publisher). @@ -1206,10 +1271,10 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + @@ -1217,17 +1282,17 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - Use for teaching roles other than specific for-credit courses within a person's home institution. Use for teaching experiences other than specific for-credit courses within a person's home institution. + + + 1 + + http://faostat.fao.org/DesktopDefault.aspx?PageID=550&lang=fr#ancor @@ -1245,13 +1310,8 @@ This class allows for linking an author to a publication while indicating inform US Patent Data; US Job Data A named collection of data, usually containing only one type of data - - - 1 - - - + Computer program and its related documentation; directs the operation of a computer @@ -1289,11 +1349,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - http://www.fao.org/termportal/contr/es/ @@ -1345,31 +1400,11 @@ This class allows for linking an author to a publication while indicating inform Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - - - - - - 1 - - - - - 1 - - A person working in a position of librarian or information professional, or academic or technical expert in support of providing information services or materials. - - - - - http://www.fao.org/termportal/contr/zh/ @@ -1385,13 +1420,13 @@ This class allows for linking an author to a publication while indicating inform stable - A scholarly academic article, typically published in a journal. - + http://purl.org/ontology/bibo/ Written by scholars for other scholars, typically published in an academic journal with an abstract and bibliography + A specific academic journal article @@ -1405,16 +1440,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - - - - 1 - - stable @@ -1446,6 +1471,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + http://purl.org/dc/terms/ http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html @@ -1479,10 +1509,10 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/en/ - - + - + 1 + http://www.fao.org/termportal/contr/ar/ @@ -1520,18 +1550,13 @@ This class allows for linking an author to a publication while indicating inform - Definition taken from: http://en.wikipedia.org/wiki/University University of Florida; Washington University in St. Louis + An institution of higher education and research, which grants academic degrees in a variety of subjects, and provides both undergraduate education and postgraduate education. - - - - - @@ -1544,44 +1569,49 @@ This class allows for linking an author to a publication while indicating inform It's anticipated that the subclasses will be used when classifying items. And, all locations can be viewable via this class. Use subclasses of core:Location when classsifying items. + + + + + A document created as a basis for discussion or a very early draft of a formal paper - - + + - - + - + 1 + - 1 - + + - - - Used for a single narrative summary of teaching, typically covering a wide range of courses including for credit and non-credit teaching over multiple semesters; the "teaches" property links a person directly with an instance of a Semester Class, typically from an institutional database of record; then use Teacher Role for information about a person's role in non-credit teaching or their specific contribution to individual courses - - - + + + Used for a single narrative summary of teaching, typically covering a wide range of courses including for credit and non-credit teaching over multiple semesters; the "teaches" property links a person directly with an instance of a Semester Class, typically from an institutional database of record; then use Teacher Role for information about a person's role in non-credit teaching or their specific contribution to individual courses + + + source: http://en.wikipedia.org/wiki/Issn @@ -1597,11 +1627,6 @@ This class allows for linking an author to a publication while indicating inform source of definition: http://www.uspto.gov/main/glossary/#p . The following site has patent number formats: http://www.uspto.gov/patents/ebc/kindcodesum.jsp . - - - - - @@ -1614,11 +1639,11 @@ This class allows for linking an author to a publication while indicating inform Articles usually contain abstracts and bibliographies. Includes peer-reviewed, non-peer-reviewed, and open access journals. Journals are usually indexed in the major academic databases such as PubMed and Web of Science. - stable A periodical of scholarly journal Articles. Contains original scholarly research or review articles by experts in the field Journal of Information Science; IEEE Intelligent System; Scientometrics + http://purl.org/ontology/bibo/ @@ -1629,10 +1654,10 @@ This class allows for linking an author to a publication while indicating inform Contains news articles, opinions, features, advertising, and is usually issued daily or weekly - - - + + 1 + @@ -1651,25 +1676,25 @@ This class allows for linking an author to a publication while indicating inform FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/fr/ - - - 1 - - + + + + + + - - + - - + + @@ -1683,14 +1708,14 @@ This class allows for linking an author to a publication while indicating inform - + - + - + Wiley Prize in Biomedical Sciences An Award or Honor An Award or Honor @@ -1708,6 +1733,11 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + @@ -1723,19 +1753,19 @@ This class allows for linking an author to a publication while indicating inform An agent that receives a communication document. + + + + + + + + Only use if no specific subclasses of core:EventSeries desribe the activity. - - - - - Only use if no specific subclasses of core:EventSeries desribe the activity. - - + A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. - - Two or more events that follow on one after the other or are connected one after the other. @@ -1746,9 +1776,9 @@ This class allows for linking an author to a publication while indicating inform - - - + + + @@ -1756,15 +1786,10 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - - - - - - + + @@ -1772,11 +1797,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - @@ -1790,10 +1810,15 @@ This class allows for linking an author to a publication while indicating inform use one freetextKeyword assertion for each keyword or phrase. - + - 1 - + + + + + + + @@ -1801,30 +1826,20 @@ use one freetextKeyword assertion for each keyword or phrase. We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - + 1 - + + + + + + - - - - - - - - 1 - - - - - - - @@ -1832,29 +1847,29 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + - - + + + + + + - - + Represents educational training that has been received. This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree. Currently any abstract name is given to individuals of this class. This could change in the future. - - - - 1 - + - + A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue - + @@ -1864,18 +1879,18 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ + Facebook; VIVOweb.org; Flickr A group of Webpages accessible on the Web. - A group of webpages available within a specific parent address or URL on the World Wide Web unstable - + - 1 - + + FAO terminology @@ -1890,18 +1905,13 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/zh/ - - - 1 - - Work consisting of collections of previously published works - Short Definition is the Medical Subject Heading (MeSH) definition A document that simultaneously contains other documents. + http://purl.org/ontology/bibo/ stable @@ -1910,16 +1920,6 @@ We would like the range of core:outcome to be the union of Event and Process; an a reified relationship - - - - - - - - 1 - - @@ -1929,7 +1929,7 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition modified from http://www.thefreedictionary.com/division. It is difficult to tell the difference between a division and a department. Cardiovascular Medicine (division within medicine) - + The Ornithological Newsletter @@ -1937,10 +1937,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + 1 - + + + + + + @@ -1948,10 +1953,10 @@ We would like the range of core:outcome to be the union of Event and Process; an The bibo:reviewOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . As of 26 May 2010, bibo:reviewOf is used with the class Review, but core:reviewIn doesn't seem to be being used. - + + 1 - - + VIVO Outreach Team; VIVO Ontology Team @@ -1966,10 +1971,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + + - 1 - + + + + 1 + @@ -1998,10 +2008,10 @@ We would like the range of core:outcome to be the union of Event and Process; an The academic degree of a Thesis - Alchohol Education Center; Center for Arts and Public Policy; Hearing Research Center + A place where a particular activity or service is concentrated. Short Definition take from http://www.thefreedictionary.com/center. @@ -2016,10 +2026,10 @@ We would like the range of core:outcome to be the union of Event and Process; an http://faostat.fao.org/site/377/default.aspx FAOSTAT http://faostat.fao.org/site/377/default.aspx - + - - + 1 + Indicates the precision of the value of a DateTimeValue instance. @@ -2034,13 +2044,13 @@ We would like the range of core:outcome to be the union of Event and Process; an - Short Definition from OCLC Input Standards, EntW A document created to summarize research findings associated with the completion of an academic degree. + stable - http://purl.org/ontology/bibo/ Works created to satisfy the requirements for an academic certification or degree; also called dissertation + @@ -2050,10 +2060,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + + @@ -2061,10 +2071,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + 1 - + UN Statistics Division @@ -2079,17 +2089,17 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + 1 + - Only use if no specific subclasses of core:Role describe the role. - + A person's or organization's type of contribution to an endeavor + Only use this broad role class if no subclasses of role describe the item being classified. @@ -2097,10 +2107,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - 1 - + + + + + + 1 + @@ -2115,19 +2130,9 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - - - @@ -2137,6 +2142,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ unstable + + + 1 + + @@ -2147,7 +2157,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A structured file of information or a set of logically related data stored and retrieved using computer-based means Short Definition is the Medical Subject Heading (MeSH) definition - + PubMed @@ -2157,22 +2167,22 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - + stable http://purl.org/ontology/bibo/ A meeting for consultation or discussion. 2010 International Congress on Autoimmunity; American Libraries Association 2009 - core:Seminar and bibo:Conference are very similar. A meeting for consultation or discussion. + + + 1 + + @@ -2180,49 +2190,39 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - - A distinct, usually ongoing and specialized unit within a large organization. Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division. + Legal (department within a company); Use for any non-academic department - - - + + + + + + + + - + - - - - - - - + + An online article or commentary appearing on a blog + - A specific blog posting - - - 1 - - - Collection of documents or information resources that have a unified identity + stable Collection of documents or information resources that have a unified identity. Archives, museums and libraries often acquire collections on specific subjects and from distinguished authors or researchers. Also includes collections of resources bundled into a license. @@ -2247,10 +2247,10 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition obtained here: http://answers.ask.com/Business/Finance/what_is_a_private_company. Examples of private companies found here: http://www.forbes.com/2008/11/03/largest-private-companies-biz-privates08-cx_sr_1103private_land.html - + - - + + @@ -2258,12 +2258,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - - B.A. Bachelor of Arts + This list may have multiple abbreviations for some degrees. An academic degree at any level, both as reported by individuals for employment and as offered by academic degree programs. + @@ -2309,15 +2309,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - + phonograph record; tape; CD; DVD; DAT An audio document; aka record. http://purl.org/ontology/bibo/ @@ -2337,6 +2332,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + A document containing an authoritative determination (as a decree or judgment) made after consideration of facts or law. @@ -2345,20 +2345,15 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ - - - - - - + 1 - + - + - - + + FAO terminology @@ -2378,8 +2373,8 @@ We would like the range of core:outcome to be the union of Event and Process; an film; video; Blu-ray Audiovisual recording in any format - + stable An audio-visual document; film, video, and so forth. @@ -2446,10 +2441,10 @@ We would like the range of core:outcome to be the union of Event and Process; an stable - - - - + + + 1 + @@ -2459,37 +2454,42 @@ We would like the range of core:outcome to be the union of Event and Process; an + A defined class of organizations that fund Grants. National Institute of Health (NIH) - + + + + + - Definition found here: http://dictionary.reference.com/browse/publisher A person or company whose business is the publishing of books, periodicals, engravings, computer software, etc. + Elsevier; Harper & Row; Indiana University Press - + - - + + - - + - + + - + + + - 1 - @@ -2516,10 +2516,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + + + + + + + @@ -2534,6 +2539,16 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/fr/ + + + + + + + + + + @@ -2544,19 +2559,14 @@ We would like the range of core:outcome to be the union of Event and Process; an The full URL. Uniform Resource Locator (URL) specifies where an identified resource is available and the mechanism for retrieving it. + http://info.slis.indiana.edu/~katy/ - - + 1 - - - - - 1 - + @@ -2576,6 +2586,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -2584,6 +2599,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable + + + + + http://www.fao.org/termportal/contr/ar/ @@ -2598,11 +2618,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - - - @@ -2631,20 +2646,25 @@ We would like the range of core:outcome to be the union of Event and Process; an Institute for Fundamental Theory - - + + This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. + Only use if no specific subclasses of foaf:organization desribe the organization. - + A generic class encompassing several types of organizations. - - + + - - + Ued to describe an organization related to bibliographic items such as a publishing company, etc. + + + + + http://www.fao.org/termportal/contr/fr/ http://www.fao.org/termportal/contr/es/ @@ -2664,21 +2684,11 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - A Person holding an academic employment appointment focused on research rather than teaching; temporary (or for some defined term) - - - - - @@ -2687,11 +2697,6 @@ We would like the range of core:outcome to be the union of Event and Process; an definition modified from: source (http://en.wikipedia.org/wiki/Seating_capacity). 55 - - - - - @@ -2708,46 +2713,41 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - + + + + + - Only use if no specific subclasses of event:Event are appropriate. - This class will also display instances of subclasses under Event, e.g. Philosophy Department Discussion Club; 2009 Racker Lecture; screening of a documentary. In addition to a location in space and time, an event may have any or all the following qualities: actively participating agents, passive factors, work products. Also, it may be in a virtual space or part of a series such as a lecture series. The previous short definition was: "An arbitrary classification of a space/time region, by a cognitive agent." - - - - - - + + + + + Something that happens at a given place and time. - - - - - - - - 1 - + + + + + + + @@ -2806,13 +2806,18 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + - + + An award, honor, or distinction received by a person on a particular date (not the award itself as given repeatedly, and not a grant award). - + A specific award on a particular date or for a particular date range. - Ninth annual Wiley Prize in Biomedical Sciences, for the discovery of a light activated ion channel @@ -2831,10 +2836,10 @@ The previous short definition was: "An arbitrary classification of a space/time Draft legislation presented for discussion to a legal body. stable - - - + + + @@ -2850,10 +2855,10 @@ The previous short definition was: "An arbitrary classification of a space/time Professor, associate professor and assistant professor are common positions for academic faculty. - + Professor; Associate Professor; Assistant Professor Academic position in a university or institution - + @@ -2869,12 +2874,12 @@ The previous short definition was: "An arbitrary classification of a space/time The dual relationship of a professor advising a student and the student being advised by a professor, typically including start and end dates - + - + - - + 1 + @@ -2886,15 +2891,15 @@ The previous short definition was: "An arbitrary classification of a space/time - + + + - 1 - - - + - + + @@ -2917,10 +2922,10 @@ modern society using the world of Star trek. Los Angeles Times, March An section number - - - + + + @@ -2953,22 +2958,27 @@ modern society using the world of Star trek. Los Angeles Times, March An agent that interview another agent. + + + + + - - - - - - + + - 1 - + + + + + + @@ -2982,10 +2992,15 @@ modern society using the world of Star trek. Los Angeles Times, March a specific period or duration, defined by (optional) start and end date/times. - - + - + 1 + + + + + + @@ -3003,25 +3018,10 @@ modern society using the world of Star trek. Los Angeles Times, March Short Definition from bibo ontology - + 1 - - - - - - - - - - - - - - - - + @@ -3033,6 +3033,11 @@ modern society using the world of Star trek. Los Angeles Times, March + + + + + FAO terminology FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -3046,17 +3051,17 @@ modern society using the world of Star trek. Los Angeles Times, March 2010-06-24 http://www.fao.org/termportal/contr/zh/ - - - 1 - - The value of the datatype property *validSince* associated to a particular area (territory or group) indicates the area's first year of validity. The geopolitical ontology traces back historic changes only until 1985, therefore, if an area has a validSince = 1985, this indicates that the area is/was valid since 1985 or before. + + + + + @@ -3069,10 +3074,10 @@ modern society using the world of Star trek. Los Angeles Times, March - + - - + 1 + @@ -3092,6 +3097,11 @@ source: http://en.wikipedia.org/wiki/ORCID . Public definition source: http://dublincore.org/2008/01/14/dcterms.rdf# . Examples of a Publisher include a person, an organization, or a service. Typically, the name of a Publisher should be used to indicate the entity. + + + + + FAO terminology http://www.fao.org/termportal/en/ @@ -3130,11 +3140,6 @@ Examples of a Publisher include a person, an organization, or a service. Typical A presentation of a series of slides, usually presented in front of an audience with written text and images. stable - - - - - @@ -3167,10 +3172,10 @@ Examples of a Publisher include a person, an organization, or a service. Typical http://purl.org/ontology/bibo/ - + - 1 - + + http://www.fao.org/termportal/contr/es/ @@ -3185,10 +3190,10 @@ Examples of a Publisher include a person, an organization, or a service. Typical 2010-06-24 - + - - + 1 + @@ -3196,16 +3201,21 @@ Examples of a Publisher include a person, an organization, or a service. Typical Resource dependent on other entities This class is here so it can be equivalent to vitro:DependentResource. Deletion in the VIVO system behaves differently when deleting members of this class: related individuals may need to be deleted as well. - + - 1 - + + + + + + + A distinct, usually specialized educational unit within an educational organization. - - + + Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts) @@ -3216,6 +3226,11 @@ Examples of a Publisher include a person, an organization, or a service. Typical RearcherID is a Thomson Reuters project where researchers have a place to manage and share their professional information. It will allow them to solve author identity issues while simultaneously adding dynamic citation metrics and collaboration networks to your personal profile. Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3234,10 +3249,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/A passage selected from a larger work. http://purl.org/ontology/bibo/ - + - - + + @@ -3248,37 +3263,27 @@ Definition source: http://isiwebofknowledge.com/researcherid/Critical or explanatory note for a Document. - - - 1 - - - - - + An intramural or extramural award to support scholarly work, such as UF09179 (VIVO) Short definition is from the Glossary of NIH Terms. + Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity - - - - - - - + + + Written musical composition for voice or instruments or both - - - + + 1 + 2010-06-24 @@ -3293,6 +3298,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + + + @@ -3308,10 +3318,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Information Science; Computer Science; Anthropology - + - 1 - + + This namespace - http://purl.org/dc/elements/1.1/ - does not appear to have this element. @@ -3328,6 +3338,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + http://www.fao.org/termportal/contr/es/ http://www.fao.org/termportal/contr/fr/ @@ -3342,11 +3357,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/2010-06-24 http://www.fao.org/termportal/en/ - - - 1 - - Universal Product Code @@ -3355,16 +3365,26 @@ Definition source: http://isiwebofknowledge.com/researcherid/http://purl.org/ontology/bibo/ source for public description: http://en.wikipedia.org/wiki/Universal_Product_Code. + + + + + A person with at least one academic appointment to a specific faculty of a university or institution of higher learning. Definition from here: http://research.carleton.ca/htr/defs.php. - - - + + + + + + + + @@ -3375,33 +3395,33 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + 1 + - + - - + + - + - - + + - + + + - - - - + + + - - + 1 - + @@ -3417,22 +3437,12 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable - - - - - - - - 1 - - @@ -3440,6 +3450,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3449,11 +3464,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ 0.7 - - - - - http://purl.org/ontology/bibo/ New Yorker @@ -3467,24 +3477,19 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Address has properties for department name, street, city, state or province, postal code, and country. For US specific address, classify using core:US Postal Code. core:Address will display all addresses. + University of Waterloo, 200 University Avenue West, Waterloo, Ontario, Canada N2L 3G1 - A code and abstract concept expressing a location on the Earth's surface. To classify US specific addresses, use core:US Postal Code. - Librarian; Library Systems Analyst; Music Bibliographer + + It is the common position in libraries. - A position held by library and information science professionals, or academic or technical experts, in support of providing information services or materials - - - 1 - - http://www.fao.org/termportal/contr/zh/ @@ -3498,35 +3503,40 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/es/ - + - + 1 + + + + + + + + + + - - + - + + - + - - + + - + - - - - - - - + 1 + @@ -3535,11 +3545,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - http://purl.org/ontology/bibo/ stable @@ -3548,10 +3553,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/Library of Congress Control Number Source: http://en.wikipedia.org/wiki/Library_of_Congress_Control_Number. - + - 1 - + 1 + + + + + + @@ -3560,10 +3570,25 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + + + + + + 1 - + + + + + + + + + + + @@ -3579,14 +3604,24 @@ Definition source: http://isiwebofknowledge.com/researcherid/A chapter of a book. A main division of a book + + + 1 + + Curriculum Steering Committee; PhD Advisory Committee + A group of people organized for a specific purpose (e.g., a reporting or advisory role), often with a charge and for a specific duration. - There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important. + + + + + Short Definition from OCLC Input Standards, EntW http://purl.org/ontology/bibo/ @@ -3604,11 +3639,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/http://purl.org/ontology/bibo/ a document that states some contractual relationship or grants some right - - - - - @@ -3620,18 +3650,28 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. + + + 1 + + - 1320 East 10th Street, Wells Library 021 Bloomington, IN 47405 - Formal address in US postal address system. + - + + US postal address follow the format street, apt or office number (optional), city, state, and zipcode. @@ -3641,11 +3681,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3663,17 +3698,22 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print. + + + 1 + + - + Short Definition from the bibo ontology + unstable A section of a book - - + + http://purl.org/ontology/bibo/ - A section of a book. @@ -3687,15 +3727,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - - - - - - + + @@ -3720,10 +3755,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable - + - - + 1 + @@ -3747,11 +3782,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3771,16 +3801,36 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/fr/ + + + + + - + + + + + + + 1 + + + - + + + + + + 1 + @@ -3792,11 +3842,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3822,11 +3867,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - A small reference book, especially one giving instructions. unstable @@ -3844,6 +3884,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/Not sure how to access the "Editor's Comments". But as North America is a continent, it would be placed directly into the continent subclass and viewable through this class along with any other subclass entities. Any region that goes beyond national boundaries and does not fit into any subclass of core:TransnationalRegion. + + + + + + + + + + @@ -3851,28 +3901,28 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + + + + + + A short form for an longer title or name. B.A. - - - - - - - - - - @@ -3885,21 +3935,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + - - - 1 - - - - - - - For example, National Science Foundation providesFundingThrough Graduate Research Fellowship Program; National Institutes of Health providesFundingThrough National Center for Research Resources. @@ -3907,6 +3952,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + A location having coordinates in geographic space. @@ -3939,6 +3989,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + An agent that is interviewed by another agent. stable @@ -3967,6 +4022,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Bacteria-resistant bandage; Termite prevention system; Hurricane resistant houses + + + + + Relates a document to some transcribed original. The bibo:transcriptOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers this term unstable. @@ -4056,21 +4116,6 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/ar/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - 1 - - - - - - 2 - - - - - - @@ -4087,6 +4132,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + @@ -4103,6 +4153,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + 1 + + @@ -4143,11 +4198,6 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/en/ - - - - - @@ -4172,17 +4222,17 @@ bibo has the domain of this property set to the union of Collection and Document A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate + + + - - + Short Definition from the bibo ontology stable + http://purl.org/ontology/bibo/ - - A document (noun) is a bounded physical representation of body of information designed with the capacity (and usually intent) to communicate. A document may manifest symbolic, diagrammatic or sensory-representational information. - @@ -4190,11 +4240,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - @@ -4260,18 +4305,28 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + + An edited book. http://purl.org/ontology/bibo/ - - + + Best American Science Writing 2009 stable An edited collection of stand-alone articles published as a book - - + + + + + 1 + Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible. @@ -4280,22 +4335,12 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Short definition obtained here: http://en.wiktionary.org/wiki/geopolitical_entity. - - - - - - - - - - 100 Caldwell Hall; 114 Martha Van Rensselaer (Rushmore Conference Room) Room that provides a particular service or is used for a particular activity. @@ -4303,59 +4348,49 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Enter room number of name. - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + 1 + @@ -4363,16 +4398,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Medicine - - - - - - - - - - http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/ar/ @@ -4391,11 +4416,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Examples shows a book has French language version. Public description source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - - - - - @@ -4403,26 +4423,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - 1 - - - - - - - - - - + - - - - - http://www.fao.org/termportal/contr/fr/ @@ -4441,23 +4446,18 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi College of Arts & Sciences; Ivy Tech Community College A primary academic unit within a University or a free-standing higher education organization without graduate degree programs. - + + + + + + Document1 isVersionOf Document2 This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - - - - - - - - @@ -4476,41 +4476,21 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://data.worldbank.org/indicator/NY.GDP.MKTP.CD - - - 1 - - - - - + + + - + 1 - - - - - - - - - - - - - - - - + @@ -4544,23 +4524,33 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - + - - + + + + + + + + + + 1 + + @@ -4568,17 +4558,12 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + UITS service UITS service is the information technology services provided by Indiana University. SC. - A regularly offered service in support of an academic, research, or administrative function (not personal or professional service by an individual) - - - - - - @@ -4589,16 +4574,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - + + + + + Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. @@ -4617,10 +4602,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + + - - + @@ -4636,12 +4621,22 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + This is done with a restriction on agent. + + + + + Code of Federal Regulations @@ -4652,31 +4647,26 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi A work consisting of texts of rules and regulations related to statutes issued by executive or administrative agencies A collection of statutes. - - - - - + An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support - - - - - + + + + - - - + + 1 + - Used information from this definition: http://dictionary.reference.com/browse/library. A collection of any materials, for study and enjoyment, which has been systematically arranged. + Marston Science Library @@ -4693,20 +4683,20 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ - - - + + + - + - - + + - + - - + + http://www.fao.org/termportal/contr/ar/ @@ -4739,30 +4729,15 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - + 1 - - - - - - + - - - - - - - - - - @@ -4770,10 +4745,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi full email address - + - - + + @@ -4781,24 +4756,14 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - - - - - Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. - - - - + + + - - - - - - + + @@ -4806,6 +4771,16 @@ We would like the range of core:outcome to be the union of Event and Process; an Chicago; New York; Bloomington; Gainesville + + + 1 + + + + + + 2 + @@ -4813,30 +4788,25 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + + + + + + For data ingest from authoritative sources to record the actual way a person was listed as author, as potentially valuable information for author disambiguation. - + + - 1 - - - - - - - - - - 1 - - - - - - + @@ -4860,29 +4830,19 @@ We would like the range of core:outcome to be the union of Event and Process; an http://aims.fao.org/website/Search-AGROVOC/sub http://aims.fao.org/website/Search-AGROVOC/sub - - - - - Used to link a bibliographic item to one of its contributor: can be an author, an editor, a publisher, etc. - - - - - - - + + - + - - + + @@ -4890,6 +4850,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + @@ -4901,25 +4866,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - Any organization (likely also asserted as another class of Organization) with a primary, ongoing research function, not just through occasional roles - + - 1 - - - - - - + + @@ -4944,6 +4899,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + http://www.fao.org/figis/servlet/RefServlet http://www.fao.org/figis/servlet/RefServlet @@ -4956,16 +4916,11 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - Medical Subject Heading (MeSH) definition of Technical Report: Work consisting of a formal report giving details of the investigation and results of a medical or other scientific problem. When issued by a government agency or comparable official body, its contents may be classified, unclassified, or declassified with regard to security clearance. This publication type may also cover a scientific paper or article that records the current state or current position of scientific research and development. If so labeled by the editor or publisher, this publication type may be properly used for journal articles. + A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc.. - http://purl.org/ontology/bibo/ A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc. @@ -4989,10 +4944,15 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/es/ FAO terminology - + - 1 - + + + + + + + 2010-06-24 @@ -5013,20 +4973,24 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - + + + - - + - + + - + + + + + @@ -5037,15 +5001,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - + + 1 + - + - 1 - + + @@ -5064,21 +5028,16 @@ We would like the range of core:outcome to be the union of Event and Process; an An organized series of a meeting for consultation or discussion. - + + + - 1 - A person registered in an undergraduate program leading to a bachelor's degree or an undergraduate diploma or certificate. - - - 1 - - An excerpted collection of words @@ -5088,11 +5047,21 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ Short Definition from the bibo ontology + + + + + + + + + + - - A position involving academic work but without faculty status + Researcher; Academic Extension Associate; Postdoctoral Associate + Those positions are held by people who do academic work but do not have faculty positions in universities or institutes. @@ -5102,11 +5071,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - Currently being used by a restriction on organization. @@ -5126,21 +5090,16 @@ We would like the range of core:outcome to be the union of Event and Process; an An outreach or community service role directed outside a person's primary profession and institution Communicating Astronomy to the Public - - - - - stable + + A loose, thematic, collection of Documents, often Books. A thematic collection of documents, usually books, issued at regular or irregular intervals http://purl.org/ontology/bibo/ - Methods in Molecular Biology - @@ -5148,11 +5107,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - Definition take from: http://dictionary.reference.com/browse/foundation. An institution financed by a donation or legacy to aid research, education, the arts, etc. @@ -5169,6 +5123,16 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal decision on appeal that takes action on a case (affirming it, reversing it, etc.). + + + + + + + + 1 + + CODEN became particularly common in the scientific community as a citation system for periodicals cited in technical- as well in chemistry-related publications and as a search tool in many bibliographic catalogues. @@ -5189,15 +5153,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + 1 - + - + - - + + @@ -5213,17 +5177,17 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet + Short Definition modified from the one found here: http://www.thefreedictionary.com/county. - Alachua; Baker; Bradford; Kenora; Ottawa; Waterloo The largest administrative division of most states or provinces. - + + + - - @@ -5248,35 +5212,40 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + - + + Short Definition from the bibo ontology A distinct part of a larger document or collected document http://purl.org/ontology/bibo/ a distinct part of a larger document or collected document. - + unstable - - - - + + + - - - + Short Definition copied from bibo ontology + - + http://purl.org/ontology/bibo/ + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers. - A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers + stable @@ -5291,17 +5260,22 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A laboratory that exists primarily to conduct research vs. to provide services + + + + + - - + + + - - An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. @@ -5323,10 +5297,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A URLLink that is designated (by the user or anyone else) as a primary link for the person, organization, event, etc. - + - - + + @@ -5338,6 +5312,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Special Libraries Association; Association for Computing Machinery(ACM); American Medical Informatics Association(AMIA) + + + + + @@ -5379,11 +5358,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/es/ @@ -5409,6 +5383,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + 1 + + @@ -5424,6 +5403,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://purl.org/ontology/bibo/ + + + 1 + + FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/zh/ @@ -5437,10 +5421,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/termportal/en/ 2010-06-24 - + - - + + @@ -5461,6 +5445,16 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49alpha.htm + + + + + + + + 1 + + paraphrased editorial note from the bibo ontology: We are not defining, using an enumeration, the range of the bibo:status to be a defined list of bibo:DocumentStatus. This is because we want people to be able to define new statuses if needed; and creating such an enumeration would prevent this. @@ -5468,12 +5462,12 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - A list of items in a collection; an ordered compilation of item descriptions and sufficient information to afford access to them + - NLM Catalog Short Definition is the Medical Subject Heading (MeSH) definition + diff --git a/productMods/WEB-INF/ontologies/update/diff.tab.txt b/productMods/WEB-INF/ontologies/update/diff.tab.txt index f341cf4e..077759c0 100644 --- a/productMods/WEB-INF/ontologies/update/diff.tab.txt +++ b/productMods/WEB-INF/ontologies/update/diff.tab.txt @@ -8,7 +8,6 @@ http://vivoweb.org/ontology/core#organizationGrantingDegree http://vivoweb.org/o http://vivoweb.org/ontology/core#offeredBy http://vivoweb.org/ontology/core#degreeOfferedBy Yes Map Directly-changed http://vivoweb.org/ontology/core#SemesterClass http://vivoweb.org/ontology/core#Course Yes Map Directly-changed http://vivoweb.org/ontology/core#taughtInSemester http://vivoweb.org/ontology/core#dateTimeInterval Yes Map Directly-changed -http://vivoweb.org/ontology/core#courseOffering http://vivoweb.org/ontology/core#dateTimeIntervalFor Yes Map Directly-changed http://vivoweb.org/ontology/core#sectionCredits http://vivoweb.org/ontology/core#courseCredits Yes Map Directly-changed http://vivoweb.org/ontology/core#listsCourse http://vivoweb.org/ontology/core#offersCourse Yes Map Directly-changed http://vivoweb.org/ontology/core#listedBy http://vivoweb.org/ontology/core#courseOfferedBy Yes Map Directly-changed @@ -60,6 +59,7 @@ http://vivoweb.org/ontology/core#endDateTime No Delete Delete http://vivoweb.org/ontology/core#endDate No Delete Delete http://vivoweb.org/ontology/core#endYearMonth No Delete Delete http://vivoweb.org/ontology/core#endTime No Delete Delete +http://vivoweb.org/ontology/core#courseOffering No Delete not set http://vivoweb.org/ontology/core#TimeInterval No Delete Delete http://vivoweb.org/ontology/core#timeIntervalFor No Delete not set http://vivoweb.org/ontology/core#hasTimeInterval No Delete not set \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf b/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf index d69f5ad4..fdffc42f 100644 --- a/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf +++ b/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf @@ -959,17 +959,6 @@ - - - 5 - 60 - This relates a geographic location to something within that geographic location, for example, an organization within that geographic location. - - - true - geographic location of - nearestGeographicLocationFor - Relates a component of something to the whole thing. 99 @@ -982,6 +971,17 @@ true true + + + 5 + 60 + This relates a geographic location to something within that geographic location, for example, an organization within that geographic location. + + + true + geographic location of + nearestGeographicLocationFor + true 5 @@ -3789,16 +3789,15 @@ - date/time interval - 5 - true - - desc - - - dateTimeIntervalForm.jsp - true 5 + true + dateTimeIntervalForm.jsp + + + + true + 5 + date/time interval Process @@ -4079,10 +4078,6 @@ Non-Faculty Academic Position - - 5 - date/time interval for - landAreaUnit diff --git a/productMods/WEB-INF/submodels/scires-1.2.owl b/productMods/WEB-INF/submodels/scires-1.2.owl index 20405ecb..f3d89731 100644 --- a/productMods/WEB-INF/submodels/scires-1.2.owl +++ b/productMods/WEB-INF/submodels/scires-1.2.owl @@ -13,6 +13,11 @@ xmlns:j.5="http://purl.org/dc/terms/" xmlns:xsd="http://www.w3.org/2001/XMLSchema#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > + + + + + @@ -29,9 +34,9 @@ An implement used to facilitate work, especially precision work. - An implement used to facilitate work, especially precision work. + A plan specification that allows different domain experts to reliably and independently reproduce a process. @@ -64,11 +69,6 @@ - - - - - diff --git a/productMods/WEB-INF/submodels/vivo-core-1.2.owl b/productMods/WEB-INF/submodels/vivo-core-1.2.owl index c678b1ab..7d9ff778 100644 --- a/productMods/WEB-INF/submodels/vivo-core-1.2.owl +++ b/productMods/WEB-INF/submodels/vivo-core-1.2.owl @@ -25,6 +25,16 @@ A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available in PubMed Central. The PMCID is issued shortly after the PI or author approves the PubMed Central formatted web version of the submission. + + + + + + + + + + http://purl.org/ontology/bibo/ Short Definition from bibo ontology @@ -34,19 +44,14 @@ Notes or annotations about a resource stable - - - 1 - - - + + + - - @@ -59,6 +64,11 @@ + + + + + @@ -72,14 +82,14 @@ An organized series of a meeting for an exchange of ideas, typically put on by a department or center. + + + + + - - - - - unstable @@ -95,30 +105,25 @@ + + + 1 + + A person who is enrolled in an educational institution. Use only if no specific subclasses of core:Student describe the person. - - - - - - + UN Cartographic Section UN Cartographic Section - + - - - - - - + @@ -126,10 +131,15 @@ - - + - + + + + + + + @@ -140,9 +150,9 @@ Accounting & Research Services Assistant; Director of Information Technology Staff, support, and other non-academic positions. - - + A position classified as professional, staff, support, or any other non-academic role + @@ -157,6 +167,11 @@ Serial Item and Contribution Identifier + + + + + @@ -166,6 +181,11 @@ + + + + + Definition take from: http://en.wikipedia.org/wiki/Government_agency. United States Library of Congress @@ -173,11 +193,6 @@ A government agency is a permanent or semi-permanent organization in the machinery of government that is responsible for the oversight and administration of specific functions. - - - - - @@ -185,10 +200,10 @@ Public description modified from the information on this page: http://www.w3.org/TR/2005/WD-swbp-skos-core-guide-20050510/#sechierarchy . - - + + - + @@ -219,44 +234,49 @@ - - - 1 - - Definition take from: http://xmlns.com/foaf/spec/#term_based_near . foaf indicates that the status of this term is "unstable". "The based_near relationship relates two "spatial things" (anything that can be somewhere), the latter typically described using the geo:lat / geo:long geo-positioning vocabulary (http://www.w3.org/2003/01/geo/wgs84_pos#). This allows us to say describe the typical latitute and longitude of, say, a Person (people are spatial things - they can be places) without implying that a precise location has been given." Used to link an agent, related to bibliographic things, to a place where it is based near: can be a city, a monument, a building, etc. + + + + + Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - + - 1 - + + - - The most general classification of a person - - + The most general classification of a person - + + + + - - - + + 1 + + + + + 1 + http://purl.org/ontology/bibo/ @@ -271,26 +291,31 @@ - - - - - - + - 1 - + + - + - 1 - + + + + + + + + + + + + @@ -300,10 +325,20 @@ http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - + - - + 1 + + + + + + + + + + 1 + @@ -319,16 +354,16 @@ Encompasses talk, speech, lecture, slide lecture, conference presentation - - - 1 - - + + + + + @@ -344,67 +379,77 @@ - - - - - - - - - - + + - - + - - + + + + + + + + + + + - + - - + + - + - - + + - - - + + + - - - + + + + + + + + + + + + 1 + @@ -423,6 +468,11 @@ + + + + + http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -436,9 +486,9 @@ http://www.fao.org/termportal/contr/fr/ FAO terminology - + - + @@ -468,30 +518,35 @@ - + - - + + - + + + + + + + + - - Audiovisual recording in video format - + - 1 - + 1 + - + - - + + @@ -502,33 +557,23 @@ http://purl.org/ontology/bibo/ something that is printed or published and distributed, esp. a given number of a periodical - + + + - - - - - - 1 - - - - - - An explicit individual period considered by an academic institution to be its primary academic cycle. - + + + - - @@ -549,6 +594,11 @@ + + + + + UN Statistics Division http://unstats.un.org/unsd/methods/m49/m49alpha.htm @@ -559,10 +609,15 @@ UN Statistics Division - + + - 1 - + + + + + + http://faostat.fao.org @@ -574,19 +629,29 @@ http://faostat.fao.org/default.aspx?lang=es FAOSTAT http://faostat.fao.org - + + + + + + + + + + + - + - - + 1 + Currently being used by a restriction on organization. @@ -594,16 +659,21 @@ - + - - + + A short written piece focused on an event or announcement of note, having a defined publication time and of less enduring interest than a news feature. + + + + + @@ -632,16 +702,11 @@ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.iso.org/iso/fr/country_codes/iso_3166_code_lists.htm - - - - - - + Authorship of journal articles, books and other original works is a means by which academics communicate the results of their scholarly work, establish priority for their discoveries, and build their reputation among their peers. This class allows for linking an author to a publication while indicating information about that author's authorship. Contains the authors name, their rank in the publication, and whether or not they are a corresponding author on the publication. @@ -655,25 +720,30 @@ This class allows for linking an author to a publication while indicating inform Bibo Definition: A seminar, discussion group, or the like, that emphasizes exchange of ideas and the demonstration and application of techniques, skills, etc. - + - - + + - + 1 - + - + - - + 1 + - + - - + + + + + + 1 + @@ -692,23 +762,18 @@ This class allows for linking an author to a publication while indicating inform stable - - - 1 - - - + Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio Independent organizations formally working together toward a common goal, under an expressed agreement - + - + - - + 1 + @@ -716,31 +781,21 @@ This class allows for linking an author to a publication while indicating inform - - - - - + - - + A group of related documents issued at regular intervals. + http://purl.org/ontology/bibo/ - stable - + - + - - - - - - - + 1 + @@ -770,6 +825,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + A large contiguous landmass that is at least partially surrounded by water, together with any islands on its continental shelf. @@ -777,16 +837,21 @@ This class allows for linking an author to a publication while indicating inform Short Definition take from http://en.wiktionary.org/wiki/continent. - + - 1 - + + + + + + + http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/en/ @@ -800,10 +865,15 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ 2010-06-24 - + + + + + + 1 - + @@ -811,16 +881,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - - - - - - This is done through a restriction on the foaf:Person class. @@ -835,23 +895,28 @@ This class allows for linking an author to a publication while indicating inform + + + + + - - - - - This is done through a restriction on the foaf:Person class. + + + + + @@ -901,6 +966,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + A unit devoted primarily to extension activities, whether for outreach or research. @@ -927,19 +997,19 @@ This class allows for linking an author to a publication while indicating inform - - - + + + - - - + + 1 + - + - - + 1 + @@ -950,11 +1020,6 @@ This class allows for linking an author to a publication while indicating inform A legal decision that affirms a ruling. - - - - - @@ -973,20 +1038,15 @@ This class allows for linking an author to a publication while indicating inform - + + + + + + - - - - - - - - - - - + @@ -995,6 +1055,11 @@ This class allows for linking an author to a publication while indicating inform Regularly updated online journal or newsletter by one or more writers, called bloggers, containing articles and commentary of interest to the blogger + + + 1 + + @@ -1014,10 +1079,10 @@ This class allows for linking an author to a publication while indicating inform Public Description from source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers the bibo:presents and the bibo:presentedAt unstable terms. It also indicates that bibo:presents is a sub-property of event:product. - - + - + 1 + 2010-06-24 @@ -1033,11 +1098,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/es/ - - - 1 - - @@ -1055,10 +1115,10 @@ This class allows for linking an author to a publication while indicating inform Either city or town - a thickly populated area having fixed boundaries and certain local powers of government. - - - + + 1 + @@ -1070,25 +1130,20 @@ This class allows for linking an author to a publication while indicating inform That is a position held by an academic faculty member who works for administration. + + Associate Dean - An academic administrative position (associate dean, etc.) as distinct from a professional administrative position (non-academic) - - + server; Bruker Vector-33 FT-IR - - A network server is one example. Medical schools and research laboratories can list professional equipment, such as microscopes. + A physical object provided for specific purpose, task or occupation. - - - - - + @@ -1103,20 +1158,20 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ A specific journal article + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a periodical or book - Short Definition modified from the bibo ontology. + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine. - stable - + - - + Director of Admissions and Placement; Associate University Librarian Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. + An employment activity, whether compensated or not. Short definition comes from http://en.wikipedia.org/wiki/Position, and has been modified. @@ -1125,16 +1180,21 @@ This class allows for linking an author to a publication while indicating inform - - - - - + + + 1 + + + + + + + The thesis degree. @@ -1146,9 +1206,9 @@ This class allows for linking an author to a publication while indicating inform The source of the public description and this info is found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html. Bibo considers this term "unstable". The bibo editorial note is: "We are not defining, using an enumeration, the range of the bibo:degree to the defined list of bibo:ThesisDegree. We won't do it because we want people to be able to define new degress if needed by some special usecases. Creating such an enumeration would restrict this to happen." - + An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials @@ -1163,15 +1223,15 @@ This class allows for linking an author to a publication while indicating inform + + + + + - - - - - Relates a document to an event; for example, a paper to a conference. @@ -1195,6 +1255,11 @@ This class allows for linking an author to a publication while indicating inform 2009-04-30 http://faostat.fao.org/DesktopDefault.aspx?PageID=377&lang=es#ancor + + + + + Public Definition source (http://www.answers.com/topic/publisher). @@ -1206,10 +1271,10 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + @@ -1217,17 +1282,17 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - Use for teaching roles other than specific for-credit courses within a person's home institution. Use for teaching experiences other than specific for-credit courses within a person's home institution. + + + 1 + + http://faostat.fao.org/DesktopDefault.aspx?PageID=550&lang=fr#ancor @@ -1245,13 +1310,8 @@ This class allows for linking an author to a publication while indicating inform US Patent Data; US Job Data A named collection of data, usually containing only one type of data - - - 1 - - - + Computer program and its related documentation; directs the operation of a computer @@ -1289,11 +1349,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - http://www.fao.org/termportal/contr/es/ @@ -1345,31 +1400,11 @@ This class allows for linking an author to a publication while indicating inform Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - - - - - - 1 - - - - - 1 - - A person working in a position of librarian or information professional, or academic or technical expert in support of providing information services or materials. - - - - - http://www.fao.org/termportal/contr/zh/ @@ -1385,13 +1420,13 @@ This class allows for linking an author to a publication while indicating inform stable - A scholarly academic article, typically published in a journal. - + http://purl.org/ontology/bibo/ Written by scholars for other scholars, typically published in an academic journal with an abstract and bibliography + A specific academic journal article @@ -1405,16 +1440,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - - - - 1 - - stable @@ -1446,6 +1471,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + http://purl.org/dc/terms/ http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html @@ -1479,10 +1509,10 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/en/ - - + - + 1 + http://www.fao.org/termportal/contr/ar/ @@ -1520,18 +1550,13 @@ This class allows for linking an author to a publication while indicating inform - Definition taken from: http://en.wikipedia.org/wiki/University University of Florida; Washington University in St. Louis + An institution of higher education and research, which grants academic degrees in a variety of subjects, and provides both undergraduate education and postgraduate education. - - - - - @@ -1544,44 +1569,49 @@ This class allows for linking an author to a publication while indicating inform It's anticipated that the subclasses will be used when classifying items. And, all locations can be viewable via this class. Use subclasses of core:Location when classsifying items. + + + + + A document created as a basis for discussion or a very early draft of a formal paper - - + + - - + - + 1 + - 1 - + + - - - Used for a single narrative summary of teaching, typically covering a wide range of courses including for credit and non-credit teaching over multiple semesters; the "teaches" property links a person directly with an instance of a Semester Class, typically from an institutional database of record; then use Teacher Role for information about a person's role in non-credit teaching or their specific contribution to individual courses - - - + + + Used for a single narrative summary of teaching, typically covering a wide range of courses including for credit and non-credit teaching over multiple semesters; the "teaches" property links a person directly with an instance of a Semester Class, typically from an institutional database of record; then use Teacher Role for information about a person's role in non-credit teaching or their specific contribution to individual courses + + + source: http://en.wikipedia.org/wiki/Issn @@ -1597,11 +1627,6 @@ This class allows for linking an author to a publication while indicating inform source of definition: http://www.uspto.gov/main/glossary/#p . The following site has patent number formats: http://www.uspto.gov/patents/ebc/kindcodesum.jsp . - - - - - @@ -1614,11 +1639,11 @@ This class allows for linking an author to a publication while indicating inform Articles usually contain abstracts and bibliographies. Includes peer-reviewed, non-peer-reviewed, and open access journals. Journals are usually indexed in the major academic databases such as PubMed and Web of Science. - stable A periodical of scholarly journal Articles. Contains original scholarly research or review articles by experts in the field Journal of Information Science; IEEE Intelligent System; Scientometrics + http://purl.org/ontology/bibo/ @@ -1629,10 +1654,10 @@ This class allows for linking an author to a publication while indicating inform Contains news articles, opinions, features, advertising, and is usually issued daily or weekly - - - + + 1 + @@ -1651,25 +1676,25 @@ This class allows for linking an author to a publication while indicating inform FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/fr/ - - - 1 - - + + + + + + - - + - - + + @@ -1683,14 +1708,14 @@ This class allows for linking an author to a publication while indicating inform - + - + - + Wiley Prize in Biomedical Sciences An Award or Honor An Award or Honor @@ -1708,6 +1733,11 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + @@ -1723,19 +1753,19 @@ This class allows for linking an author to a publication while indicating inform An agent that receives a communication document. + + + + + + + + Only use if no specific subclasses of core:EventSeries desribe the activity. - - - - - Only use if no specific subclasses of core:EventSeries desribe the activity. - - + A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. - - Two or more events that follow on one after the other or are connected one after the other. @@ -1746,9 +1776,9 @@ This class allows for linking an author to a publication while indicating inform - - - + + + @@ -1756,15 +1786,10 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - - - - - - + + @@ -1772,11 +1797,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - @@ -1790,10 +1810,15 @@ This class allows for linking an author to a publication while indicating inform use one freetextKeyword assertion for each keyword or phrase. - + - 1 - + + + + + + + @@ -1801,30 +1826,20 @@ use one freetextKeyword assertion for each keyword or phrase. We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - + 1 - + + + + + + - - - - - - - - 1 - - - - - - - @@ -1832,29 +1847,29 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + - - + + + + + + - - + Represents educational training that has been received. This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree. Currently any abstract name is given to individuals of this class. This could change in the future. - - - - 1 - + - + A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue - + @@ -1864,18 +1879,18 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ + Facebook; VIVOweb.org; Flickr A group of Webpages accessible on the Web. - A group of webpages available within a specific parent address or URL on the World Wide Web unstable - + - 1 - + + FAO terminology @@ -1890,18 +1905,13 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/zh/ - - - 1 - - Work consisting of collections of previously published works - Short Definition is the Medical Subject Heading (MeSH) definition A document that simultaneously contains other documents. + http://purl.org/ontology/bibo/ stable @@ -1910,16 +1920,6 @@ We would like the range of core:outcome to be the union of Event and Process; an a reified relationship - - - - - - - - 1 - - @@ -1929,7 +1929,7 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition modified from http://www.thefreedictionary.com/division. It is difficult to tell the difference between a division and a department. Cardiovascular Medicine (division within medicine) - + The Ornithological Newsletter @@ -1937,10 +1937,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + 1 - + + + + + + @@ -1948,10 +1953,10 @@ We would like the range of core:outcome to be the union of Event and Process; an The bibo:reviewOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . As of 26 May 2010, bibo:reviewOf is used with the class Review, but core:reviewIn doesn't seem to be being used. - + + 1 - - + VIVO Outreach Team; VIVO Ontology Team @@ -1966,10 +1971,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + + - 1 - + + + + 1 + @@ -1998,10 +2008,10 @@ We would like the range of core:outcome to be the union of Event and Process; an The academic degree of a Thesis - Alchohol Education Center; Center for Arts and Public Policy; Hearing Research Center + A place where a particular activity or service is concentrated. Short Definition take from http://www.thefreedictionary.com/center. @@ -2016,10 +2026,10 @@ We would like the range of core:outcome to be the union of Event and Process; an http://faostat.fao.org/site/377/default.aspx FAOSTAT http://faostat.fao.org/site/377/default.aspx - + - - + 1 + Indicates the precision of the value of a DateTimeValue instance. @@ -2034,13 +2044,13 @@ We would like the range of core:outcome to be the union of Event and Process; an - Short Definition from OCLC Input Standards, EntW A document created to summarize research findings associated with the completion of an academic degree. + stable - http://purl.org/ontology/bibo/ Works created to satisfy the requirements for an academic certification or degree; also called dissertation + @@ -2050,10 +2060,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + + @@ -2061,10 +2071,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + 1 - + UN Statistics Division @@ -2079,17 +2089,17 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + 1 + - Only use if no specific subclasses of core:Role describe the role. - + A person's or organization's type of contribution to an endeavor + Only use this broad role class if no subclasses of role describe the item being classified. @@ -2097,10 +2107,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - 1 - + + + + + + 1 + @@ -2115,19 +2130,9 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - - - @@ -2137,6 +2142,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ unstable + + + 1 + + @@ -2147,7 +2157,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A structured file of information or a set of logically related data stored and retrieved using computer-based means Short Definition is the Medical Subject Heading (MeSH) definition - + PubMed @@ -2157,22 +2167,22 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - + stable http://purl.org/ontology/bibo/ A meeting for consultation or discussion. 2010 International Congress on Autoimmunity; American Libraries Association 2009 - core:Seminar and bibo:Conference are very similar. A meeting for consultation or discussion. + + + 1 + + @@ -2180,49 +2190,39 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - - A distinct, usually ongoing and specialized unit within a large organization. Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division. + Legal (department within a company); Use for any non-academic department - - - + + + + + + + + - + - - - - - - - + + An online article or commentary appearing on a blog + - A specific blog posting - - - 1 - - - Collection of documents or information resources that have a unified identity + stable Collection of documents or information resources that have a unified identity. Archives, museums and libraries often acquire collections on specific subjects and from distinguished authors or researchers. Also includes collections of resources bundled into a license. @@ -2247,10 +2247,10 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition obtained here: http://answers.ask.com/Business/Finance/what_is_a_private_company. Examples of private companies found here: http://www.forbes.com/2008/11/03/largest-private-companies-biz-privates08-cx_sr_1103private_land.html - + - - + + @@ -2258,12 +2258,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - - B.A. Bachelor of Arts + This list may have multiple abbreviations for some degrees. An academic degree at any level, both as reported by individuals for employment and as offered by academic degree programs. + @@ -2309,15 +2309,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - + phonograph record; tape; CD; DVD; DAT An audio document; aka record. http://purl.org/ontology/bibo/ @@ -2337,6 +2332,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + A document containing an authoritative determination (as a decree or judgment) made after consideration of facts or law. @@ -2345,20 +2345,15 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ - - - - - - + 1 - + - + - - + + FAO terminology @@ -2378,8 +2373,8 @@ We would like the range of core:outcome to be the union of Event and Process; an film; video; Blu-ray Audiovisual recording in any format - + stable An audio-visual document; film, video, and so forth. @@ -2446,10 +2441,10 @@ We would like the range of core:outcome to be the union of Event and Process; an stable - - - - + + + 1 + @@ -2459,37 +2454,42 @@ We would like the range of core:outcome to be the union of Event and Process; an + A defined class of organizations that fund Grants. National Institute of Health (NIH) - + + + + + - Definition found here: http://dictionary.reference.com/browse/publisher A person or company whose business is the publishing of books, periodicals, engravings, computer software, etc. + Elsevier; Harper & Row; Indiana University Press - + - - + + - - + - + + - + + + - 1 - @@ -2516,10 +2516,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + + + + + + + @@ -2534,6 +2539,16 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/fr/ + + + + + + + + + + @@ -2544,19 +2559,14 @@ We would like the range of core:outcome to be the union of Event and Process; an The full URL. Uniform Resource Locator (URL) specifies where an identified resource is available and the mechanism for retrieving it. + http://info.slis.indiana.edu/~katy/ - - + 1 - - - - - 1 - + @@ -2576,6 +2586,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -2584,6 +2599,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable + + + + + http://www.fao.org/termportal/contr/ar/ @@ -2598,11 +2618,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - - - @@ -2631,20 +2646,25 @@ We would like the range of core:outcome to be the union of Event and Process; an Institute for Fundamental Theory - - + + This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. + Only use if no specific subclasses of foaf:organization desribe the organization. - + A generic class encompassing several types of organizations. - - + + - - + Ued to describe an organization related to bibliographic items such as a publishing company, etc. + + + + + http://www.fao.org/termportal/contr/fr/ http://www.fao.org/termportal/contr/es/ @@ -2664,21 +2684,11 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - A Person holding an academic employment appointment focused on research rather than teaching; temporary (or for some defined term) - - - - - @@ -2687,11 +2697,6 @@ We would like the range of core:outcome to be the union of Event and Process; an definition modified from: source (http://en.wikipedia.org/wiki/Seating_capacity). 55 - - - - - @@ -2708,46 +2713,41 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - + + + + + - Only use if no specific subclasses of event:Event are appropriate. - This class will also display instances of subclasses under Event, e.g. Philosophy Department Discussion Club; 2009 Racker Lecture; screening of a documentary. In addition to a location in space and time, an event may have any or all the following qualities: actively participating agents, passive factors, work products. Also, it may be in a virtual space or part of a series such as a lecture series. The previous short definition was: "An arbitrary classification of a space/time region, by a cognitive agent." - - - - - - + + + + + Something that happens at a given place and time. - - - - - - - - 1 - + + + + + + + @@ -2806,13 +2806,18 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + - + + An award, honor, or distinction received by a person on a particular date (not the award itself as given repeatedly, and not a grant award). - + A specific award on a particular date or for a particular date range. - Ninth annual Wiley Prize in Biomedical Sciences, for the discovery of a light activated ion channel @@ -2831,10 +2836,10 @@ The previous short definition was: "An arbitrary classification of a space/time Draft legislation presented for discussion to a legal body. stable - - - + + + @@ -2850,10 +2855,10 @@ The previous short definition was: "An arbitrary classification of a space/time Professor, associate professor and assistant professor are common positions for academic faculty. - + Professor; Associate Professor; Assistant Professor Academic position in a university or institution - + @@ -2869,12 +2874,12 @@ The previous short definition was: "An arbitrary classification of a space/time The dual relationship of a professor advising a student and the student being advised by a professor, typically including start and end dates - + - + - - + 1 + @@ -2886,15 +2891,15 @@ The previous short definition was: "An arbitrary classification of a space/time - + + + - 1 - - - + - + + @@ -2917,10 +2922,10 @@ modern society using the world of Star trek. Los Angeles Times, March An section number - - - + + + @@ -2953,22 +2958,27 @@ modern society using the world of Star trek. Los Angeles Times, March An agent that interview another agent. + + + + + - - - - - - + + - 1 - + + + + + + @@ -2982,10 +2992,15 @@ modern society using the world of Star trek. Los Angeles Times, March a specific period or duration, defined by (optional) start and end date/times. - - + - + 1 + + + + + + @@ -3003,25 +3018,10 @@ modern society using the world of Star trek. Los Angeles Times, March Short Definition from bibo ontology - + 1 - - - - - - - - - - - - - - - - + @@ -3033,6 +3033,11 @@ modern society using the world of Star trek. Los Angeles Times, March + + + + + FAO terminology FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -3046,17 +3051,17 @@ modern society using the world of Star trek. Los Angeles Times, March 2010-06-24 http://www.fao.org/termportal/contr/zh/ - - - 1 - - The value of the datatype property *validSince* associated to a particular area (territory or group) indicates the area's first year of validity. The geopolitical ontology traces back historic changes only until 1985, therefore, if an area has a validSince = 1985, this indicates that the area is/was valid since 1985 or before. + + + + + @@ -3069,10 +3074,10 @@ modern society using the world of Star trek. Los Angeles Times, March - + - - + 1 + @@ -3092,6 +3097,11 @@ source: http://en.wikipedia.org/wiki/ORCID . Public definition source: http://dublincore.org/2008/01/14/dcterms.rdf# . Examples of a Publisher include a person, an organization, or a service. Typically, the name of a Publisher should be used to indicate the entity. + + + + + FAO terminology http://www.fao.org/termportal/en/ @@ -3130,11 +3140,6 @@ Examples of a Publisher include a person, an organization, or a service. Typical A presentation of a series of slides, usually presented in front of an audience with written text and images. stable - - - - - @@ -3167,10 +3172,10 @@ Examples of a Publisher include a person, an organization, or a service. Typical http://purl.org/ontology/bibo/ - + - 1 - + + http://www.fao.org/termportal/contr/es/ @@ -3185,10 +3190,10 @@ Examples of a Publisher include a person, an organization, or a service. Typical 2010-06-24 - + - - + 1 + @@ -3196,16 +3201,21 @@ Examples of a Publisher include a person, an organization, or a service. Typical Resource dependent on other entities This class is here so it can be equivalent to vitro:DependentResource. Deletion in the VIVO system behaves differently when deleting members of this class: related individuals may need to be deleted as well. - + - 1 - + + + + + + + A distinct, usually specialized educational unit within an educational organization. - - + + Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts) @@ -3216,6 +3226,11 @@ Examples of a Publisher include a person, an organization, or a service. Typical RearcherID is a Thomson Reuters project where researchers have a place to manage and share their professional information. It will allow them to solve author identity issues while simultaneously adding dynamic citation metrics and collaboration networks to your personal profile. Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3234,10 +3249,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/A passage selected from a larger work. http://purl.org/ontology/bibo/ - + - - + + @@ -3248,37 +3263,27 @@ Definition source: http://isiwebofknowledge.com/researcherid/Critical or explanatory note for a Document. - - - 1 - - - - - + An intramural or extramural award to support scholarly work, such as UF09179 (VIVO) Short definition is from the Glossary of NIH Terms. + Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity - - - - - - - + + + Written musical composition for voice or instruments or both - - - + + 1 + 2010-06-24 @@ -3293,6 +3298,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + + + @@ -3308,10 +3318,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Information Science; Computer Science; Anthropology - + - 1 - + + This namespace - http://purl.org/dc/elements/1.1/ - does not appear to have this element. @@ -3328,6 +3338,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + http://www.fao.org/termportal/contr/es/ http://www.fao.org/termportal/contr/fr/ @@ -3342,11 +3357,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/2010-06-24 http://www.fao.org/termportal/en/ - - - 1 - - Universal Product Code @@ -3355,16 +3365,26 @@ Definition source: http://isiwebofknowledge.com/researcherid/http://purl.org/ontology/bibo/ source for public description: http://en.wikipedia.org/wiki/Universal_Product_Code. + + + + + A person with at least one academic appointment to a specific faculty of a university or institution of higher learning. Definition from here: http://research.carleton.ca/htr/defs.php. - - - + + + + + + + + @@ -3375,33 +3395,33 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + 1 + - + - - + + - + - - + + - + + + - - - - + + + - - + 1 - + @@ -3417,22 +3437,12 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable - - - - - - - - 1 - - @@ -3440,6 +3450,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3449,11 +3464,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ 0.7 - - - - - http://purl.org/ontology/bibo/ New Yorker @@ -3467,24 +3477,19 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Address has properties for department name, street, city, state or province, postal code, and country. For US specific address, classify using core:US Postal Code. core:Address will display all addresses. + University of Waterloo, 200 University Avenue West, Waterloo, Ontario, Canada N2L 3G1 - A code and abstract concept expressing a location on the Earth's surface. To classify US specific addresses, use core:US Postal Code. - Librarian; Library Systems Analyst; Music Bibliographer + + It is the common position in libraries. - A position held by library and information science professionals, or academic or technical experts, in support of providing information services or materials - - - 1 - - http://www.fao.org/termportal/contr/zh/ @@ -3498,35 +3503,40 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/es/ - + - + 1 + + + + + + + + + + - - + - + + - + - - + + - + - - - - - - - + 1 + @@ -3535,11 +3545,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - http://purl.org/ontology/bibo/ stable @@ -3548,10 +3553,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/Library of Congress Control Number Source: http://en.wikipedia.org/wiki/Library_of_Congress_Control_Number. - + - 1 - + 1 + + + + + + @@ -3560,10 +3570,25 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + + + + + + 1 - + + + + + + + + + + + @@ -3579,14 +3604,24 @@ Definition source: http://isiwebofknowledge.com/researcherid/A chapter of a book. A main division of a book + + + 1 + + Curriculum Steering Committee; PhD Advisory Committee + A group of people organized for a specific purpose (e.g., a reporting or advisory role), often with a charge and for a specific duration. - There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important. + + + + + Short Definition from OCLC Input Standards, EntW http://purl.org/ontology/bibo/ @@ -3604,11 +3639,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/http://purl.org/ontology/bibo/ a document that states some contractual relationship or grants some right - - - - - @@ -3620,18 +3650,28 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. + + + 1 + + - 1320 East 10th Street, Wells Library 021 Bloomington, IN 47405 - Formal address in US postal address system. + - + + US postal address follow the format street, apt or office number (optional), city, state, and zipcode. @@ -3641,11 +3681,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3663,17 +3698,22 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print. + + + 1 + + - + Short Definition from the bibo ontology + unstable A section of a book - - + + http://purl.org/ontology/bibo/ - A section of a book. @@ -3687,15 +3727,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - - - - - - + + @@ -3720,10 +3755,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable - + - - + 1 + @@ -3747,11 +3782,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3771,16 +3801,36 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/fr/ + + + + + - + + + + + + + 1 + + + - + + + + + + 1 + @@ -3792,11 +3842,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3822,11 +3867,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - A small reference book, especially one giving instructions. unstable @@ -3844,6 +3884,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/Not sure how to access the "Editor's Comments". But as North America is a continent, it would be placed directly into the continent subclass and viewable through this class along with any other subclass entities. Any region that goes beyond national boundaries and does not fit into any subclass of core:TransnationalRegion. + + + + + + + + + + @@ -3851,28 +3901,28 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + + + + + + A short form for an longer title or name. B.A. - - - - - - - - - - @@ -3885,21 +3935,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + - - - 1 - - - - - - - For example, National Science Foundation providesFundingThrough Graduate Research Fellowship Program; National Institutes of Health providesFundingThrough National Center for Research Resources. @@ -3907,6 +3952,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + A location having coordinates in geographic space. @@ -3939,6 +3989,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + An agent that is interviewed by another agent. stable @@ -3967,6 +4022,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Bacteria-resistant bandage; Termite prevention system; Hurricane resistant houses + + + + + Relates a document to some transcribed original. The bibo:transcriptOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers this term unstable. @@ -4056,21 +4116,6 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/ar/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - 1 - - - - - - 2 - - - - - - @@ -4087,6 +4132,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + @@ -4103,6 +4153,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + 1 + + @@ -4143,11 +4198,6 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/en/ - - - - - @@ -4172,17 +4222,17 @@ bibo has the domain of this property set to the union of Collection and Document A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate + + + - - + Short Definition from the bibo ontology stable + http://purl.org/ontology/bibo/ - - A document (noun) is a bounded physical representation of body of information designed with the capacity (and usually intent) to communicate. A document may manifest symbolic, diagrammatic or sensory-representational information. - @@ -4190,11 +4240,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - @@ -4260,18 +4305,28 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + + An edited book. http://purl.org/ontology/bibo/ - - + + Best American Science Writing 2009 stable An edited collection of stand-alone articles published as a book - - + + + + + 1 + Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible. @@ -4280,22 +4335,12 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Short definition obtained here: http://en.wiktionary.org/wiki/geopolitical_entity. - - - - - - - - - - 100 Caldwell Hall; 114 Martha Van Rensselaer (Rushmore Conference Room) Room that provides a particular service or is used for a particular activity. @@ -4303,59 +4348,49 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Enter room number of name. - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + 1 + @@ -4363,16 +4398,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Medicine - - - - - - - - - - http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/ar/ @@ -4391,11 +4416,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Examples shows a book has French language version. Public description source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - - - - - @@ -4403,26 +4423,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - 1 - - - - - - - - - - + - - - - - http://www.fao.org/termportal/contr/fr/ @@ -4441,23 +4446,18 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi College of Arts & Sciences; Ivy Tech Community College A primary academic unit within a University or a free-standing higher education organization without graduate degree programs. - + + + + + + Document1 isVersionOf Document2 This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - - - - - - - - @@ -4476,41 +4476,21 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://data.worldbank.org/indicator/NY.GDP.MKTP.CD - - - 1 - - - - - + + + - + 1 - - - - - - - - - - - - - - - - + @@ -4544,23 +4524,33 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - + - - + + + + + + + + + + 1 + + @@ -4568,17 +4558,12 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + UITS service UITS service is the information technology services provided by Indiana University. SC. - A regularly offered service in support of an academic, research, or administrative function (not personal or professional service by an individual) - - - - - - @@ -4589,16 +4574,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - + + + + + Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. @@ -4617,10 +4602,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + + - - + @@ -4636,12 +4621,22 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + This is done with a restriction on agent. + + + + + Code of Federal Regulations @@ -4652,31 +4647,26 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi A work consisting of texts of rules and regulations related to statutes issued by executive or administrative agencies A collection of statutes. - - - - - + An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support - - - - - + + + + - - - + + 1 + - Used information from this definition: http://dictionary.reference.com/browse/library. A collection of any materials, for study and enjoyment, which has been systematically arranged. + Marston Science Library @@ -4693,20 +4683,20 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ - - - + + + - + - - + + - + - - + + http://www.fao.org/termportal/contr/ar/ @@ -4739,30 +4729,15 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - + 1 - - - - - - + - - - - - - - - - - @@ -4770,10 +4745,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi full email address - + - - + + @@ -4781,24 +4756,14 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - - - - - Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. - - - - + + + - - - - - - + + @@ -4806,6 +4771,16 @@ We would like the range of core:outcome to be the union of Event and Process; an Chicago; New York; Bloomington; Gainesville + + + 1 + + + + + + 2 + @@ -4813,30 +4788,25 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + + + + + + For data ingest from authoritative sources to record the actual way a person was listed as author, as potentially valuable information for author disambiguation. - + + - 1 - - - - - - - - - - 1 - - - - - - + @@ -4860,29 +4830,19 @@ We would like the range of core:outcome to be the union of Event and Process; an http://aims.fao.org/website/Search-AGROVOC/sub http://aims.fao.org/website/Search-AGROVOC/sub - - - - - Used to link a bibliographic item to one of its contributor: can be an author, an editor, a publisher, etc. - - - - - - - + + - + - - + + @@ -4890,6 +4850,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + @@ -4901,25 +4866,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - Any organization (likely also asserted as another class of Organization) with a primary, ongoing research function, not just through occasional roles - + - 1 - - - - - - + + @@ -4944,6 +4899,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + http://www.fao.org/figis/servlet/RefServlet http://www.fao.org/figis/servlet/RefServlet @@ -4956,16 +4916,11 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - Medical Subject Heading (MeSH) definition of Technical Report: Work consisting of a formal report giving details of the investigation and results of a medical or other scientific problem. When issued by a government agency or comparable official body, its contents may be classified, unclassified, or declassified with regard to security clearance. This publication type may also cover a scientific paper or article that records the current state or current position of scientific research and development. If so labeled by the editor or publisher, this publication type may be properly used for journal articles. + A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc.. - http://purl.org/ontology/bibo/ A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc. @@ -4989,10 +4944,15 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/es/ FAO terminology - + - 1 - + + + + + + + 2010-06-24 @@ -5013,20 +4973,24 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - + + + - - + - + + - + + + + + @@ -5037,15 +5001,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - + + 1 + - + - 1 - + + @@ -5064,21 +5028,16 @@ We would like the range of core:outcome to be the union of Event and Process; an An organized series of a meeting for consultation or discussion. - + + + - 1 - A person registered in an undergraduate program leading to a bachelor's degree or an undergraduate diploma or certificate. - - - 1 - - An excerpted collection of words @@ -5088,11 +5047,21 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ Short Definition from the bibo ontology + + + + + + + + + + - - A position involving academic work but without faculty status + Researcher; Academic Extension Associate; Postdoctoral Associate + Those positions are held by people who do academic work but do not have faculty positions in universities or institutes. @@ -5102,11 +5071,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - Currently being used by a restriction on organization. @@ -5126,21 +5090,16 @@ We would like the range of core:outcome to be the union of Event and Process; an An outreach or community service role directed outside a person's primary profession and institution Communicating Astronomy to the Public - - - - - stable + + A loose, thematic, collection of Documents, often Books. A thematic collection of documents, usually books, issued at regular or irregular intervals http://purl.org/ontology/bibo/ - Methods in Molecular Biology - @@ -5148,11 +5107,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - Definition take from: http://dictionary.reference.com/browse/foundation. An institution financed by a donation or legacy to aid research, education, the arts, etc. @@ -5169,6 +5123,16 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal decision on appeal that takes action on a case (affirming it, reversing it, etc.). + + + + + + + + 1 + + CODEN became particularly common in the scientific community as a citation system for periodicals cited in technical- as well in chemistry-related publications and as a search tool in many bibliographic catalogues. @@ -5189,15 +5153,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + 1 - + - + - - + + @@ -5213,17 +5177,17 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet + Short Definition modified from the one found here: http://www.thefreedictionary.com/county. - Alachua; Baker; Bradford; Kenora; Ottawa; Waterloo The largest administrative division of most states or provinces. - + + + - - @@ -5248,35 +5212,40 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + - + + Short Definition from the bibo ontology A distinct part of a larger document or collected document http://purl.org/ontology/bibo/ a distinct part of a larger document or collected document. - + unstable - - - - + + + - - - + Short Definition copied from bibo ontology + - + http://purl.org/ontology/bibo/ + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers. - A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers + stable @@ -5291,17 +5260,22 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A laboratory that exists primarily to conduct research vs. to provide services + + + + + - - + + + - - An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. @@ -5323,10 +5297,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A URLLink that is designated (by the user or anyone else) as a primary link for the person, organization, event, etc. - + - - + + @@ -5338,6 +5312,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Special Libraries Association; Association for Computing Machinery(ACM); American Medical Informatics Association(AMIA) + + + + + @@ -5379,11 +5358,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/es/ @@ -5409,6 +5383,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + 1 + + @@ -5424,6 +5403,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://purl.org/ontology/bibo/ + + + 1 + + FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/zh/ @@ -5437,10 +5421,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/termportal/en/ 2010-06-24 - + - - + + @@ -5461,6 +5445,16 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49alpha.htm + + + + + + + + 1 + + paraphrased editorial note from the bibo ontology: We are not defining, using an enumeration, the range of the bibo:status to be a defined list of bibo:DocumentStatus. This is because we want people to be able to define new statuses if needed; and creating such an enumeration would prevent this. @@ -5468,12 +5462,12 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - A list of items in a collection; an ordered compilation of item descriptions and sufficient information to afford access to them + - NLM Catalog Short Definition is the Medical Subject Heading (MeSH) definition + From a298ede830bbc00878d326dffbd98813c83e49bc Mon Sep 17 00:00:00 2001 From: cdtank Date: Tue, 8 Feb 2011 22:09:01 +0000 Subject: [PATCH 376/427] 1. Improved the logic that displayed counts in cases of collaboration sparklines. --- .../freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java | 4 +--- .../coprincipalinvestigator/CoPIVisCodeGenerator.java | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java index 3abf27fa..559ba6c2 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java @@ -146,7 +146,7 @@ public class CoAuthorshipVisCodeGenerator { yearToUniqueCoauthorsCountDataTable.add(new YearToEntityCountDataElement(uniqueCoAuthorCounter, publicationYearAsString, currentUniqueCoAuthors)); - + renderedFullSparks += currentUniqueCoAuthors; uniqueCoAuthorCounter++; } @@ -156,8 +156,6 @@ public class CoAuthorshipVisCodeGenerator { * Sparks that will be rendered in full mode will always be the one's which have any year * associated with it. Hence. * */ - renderedFullSparks = allCoAuthorsWithKnownAuthorshipYears.size(); - sparklineData.setRenderedSparks(renderedFullSparks); sparklineData.setYearToEntityCountDataTable(yearToUniqueCoauthorsCountDataTable); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIVisCodeGenerator.java index 6a5867d5..17a26247 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIVisCodeGenerator.java @@ -155,6 +155,8 @@ public class CoPIVisCodeGenerator { yearToUniqueInvestigatorsCountDataTable.add(new YearToEntityCountDataElement(uniqueCoPICounter, grantYearAsString, currentUniqueCoPIs)); + + renderedFullSparks += currentUniqueCoPIs; uniqueCoPICounter++; } @@ -164,8 +166,6 @@ public class CoPIVisCodeGenerator { * rendered in full mode will always be the one's which have any year * associated with it. Hence. */ - renderedFullSparks = allCoPIsWithKnownGrantShipYears.size(); - sparklineData.setRenderedSparks(renderedFullSparks); sparklineData.setYearToEntityCountDataTable(yearToUniqueInvestigatorsCountDataTable); From 655d7a4572c52df61c8bbe63699e4a0ba0fb7ea3 Mon Sep 17 00:00:00 2001 From: bkoniden Date: Tue, 8 Feb 2011 22:13:31 +0000 Subject: [PATCH 377/427] removing a write to System.out in EntitySubOrganizationTypesConstructQueryRunner --- .../EntitySubOrganizationTypesConstructQueryRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java index f50516d0..7211624e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java @@ -161,7 +161,7 @@ public class EntitySubOrganizationTypesConstructQueryRunner { Model model = executeQuery(constructQueries, this.dataSource); - model.write(System.out); + //model.write(System.out); return model; } From d99dbdd52646619a03b0bbd27a227c215c9cc487 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Tue, 8 Feb 2011 22:52:53 +0000 Subject: [PATCH 378/427] NIHVIVO-2073 Modify custom view when there is no linked individual --- productMods/config/listViewConfig-authorInAuthorship.xml | 4 ++-- productMods/config/listViewConfig-dateTimeInterval.xml | 4 ++-- productMods/config/listViewConfig-dateTimeValue.xml | 1 - productMods/config/listViewConfig-educationalTraining.xml | 6 ++---- productMods/config/listViewConfig-hasRole.xml | 4 ++-- .../listViewConfig-informationResourceInAuthorship.xml | 4 ++-- .../config/listViewConfig-organizationForPosition.xml | 4 ++-- productMods/config/listViewConfig-personInPosition.xml | 4 ++-- productMods/config/listViewConfig-relatedRole.xml | 4 ++-- .../individual/propStatement-authorInAuthorship.ftl | 2 +- .../partials/individual/propStatement-dateTimeInterval.ftl | 2 +- .../partials/individual/propStatement-dateTimeValue.ftl | 2 +- .../individual/propStatement-educationalTraining.ftl | 2 +- .../body/partials/individual/propStatement-hasRole.ftl | 2 +- .../propStatement-informationResourceInAuthorship.ftl | 2 +- .../individual/propStatement-organizationForPosition.ftl | 2 +- .../partials/individual/propStatement-personInPosition.ftl | 2 +- .../body/partials/individual/propStatement-relatedRole.ftl | 2 +- 18 files changed, 25 insertions(+), 28 deletions(-) diff --git a/productMods/config/listViewConfig-authorInAuthorship.xml b/productMods/config/listViewConfig-authorInAuthorship.xml index c48255e5..9b214b58 100644 --- a/productMods/config/listViewConfig-authorInAuthorship.xml +++ b/productMods/config/listViewConfig-authorInAuthorship.xml @@ -9,7 +9,7 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> - SELECT DISTINCT ?authorship (afn:localname(?authorship) AS ?authorshipName) + SELECT DISTINCT ?authorship ?infoResource ?infoResourceName ?dateTime WHERE { ?subject ?property ?authorship @@ -28,7 +28,7 @@ PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> SELECT DISTINCT ?subclass - ?authorship (afn:localname(?authorship) AS ?authorshipName) + ?authorship ?infoResource ?infoResourceName ?dateTime WHERE { ?subject ?property ?authorship diff --git a/productMods/config/listViewConfig-dateTimeInterval.xml b/productMods/config/listViewConfig-dateTimeInterval.xml index fc04ae41..f9def01e 100644 --- a/productMods/config/listViewConfig-dateTimeInterval.xml +++ b/productMods/config/listViewConfig-dateTimeInterval.xml @@ -9,7 +9,7 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> - SELECT DISTINCT ?dateTimeInterval ?intervalName + SELECT DISTINCT ?dateTimeInterval ?valueStart ?valueStartName ?dateTimeStart ?precisionStart @@ -17,7 +17,7 @@ ?dateTimeEnd ?precisionEnd WHERE { ?subject ?property ?dateTimeInterval - LET (?intervalName := afn:localname(?dateTimeInterval)) + OPTIONAL { ?dateTimeInterval core:start ?valueStart LET (?valueStartName := afn:localname(?valueStart)) OPTIONAL { ?valueStart core:dateTime ?dateTimeStart } diff --git a/productMods/config/listViewConfig-dateTimeValue.xml b/productMods/config/listViewConfig-dateTimeValue.xml index 78407434..a26786b3 100644 --- a/productMods/config/listViewConfig-dateTimeValue.xml +++ b/productMods/config/listViewConfig-dateTimeValue.xml @@ -10,7 +10,6 @@ PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> SELECT DISTINCT ?dateTimeValue - (afn:localname(?dateTimeValue) AS ?dateTimeValueName) (afn:localname(?dateTimePrecision) AS ?precision) ?dateTime WHERE { ?subject ?property ?dateTimeValue diff --git a/productMods/config/listViewConfig-educationalTraining.xml b/productMods/config/listViewConfig-educationalTraining.xml index a9321cdc..ee68d472 100644 --- a/productMods/config/listViewConfig-educationalTraining.xml +++ b/productMods/config/listViewConfig-educationalTraining.xml @@ -9,14 +9,13 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> - SELECT DISTINCT ?edTraining ?edTrainingName + SELECT DISTINCT ?edTraining ?org ?orgName ?degreeName ?degreeAbbr ?majorField ?deptOrSchool ?info ?dateTimeStart ?dateTimeEnd WHERE { ?subject ?property ?edTraining - LET (?edTrainingName := afn:localname(?edTraining)) OPTIONAL { ?edTraining core:trainingAtOrganization ?org . ?org rdfs:label ?orgName } @@ -45,14 +44,13 @@ PREFIX foaf: <http://xmlns.com/foaf/0.1/> SELECT DISTINCT ?subclass - ?edTraining ?edTrainingName + ?edTraining ?org ?orgName ?degreeName ?degreeAbbr ?majorField ?deptOrSchool ?info ?dateTimeStart ?dateTimeEnd WHERE { ?subject ?property ?edTraining - LET (?edTrainingName := afn:localname(?edTraining)) OPTIONAL { ?edTraining core:trainingAtOrganization ?org . ?org rdfs:label ?orgName OPTIONAL { ?subclass rdfs:subClassOf foaf:Organization . diff --git a/productMods/config/listViewConfig-hasRole.xml b/productMods/config/listViewConfig-hasRole.xml index bb6dd7d1..82b60c8c 100644 --- a/productMods/config/listViewConfig-hasRole.xml +++ b/productMods/config/listViewConfig-hasRole.xml @@ -9,7 +9,7 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> - SELECT DISTINCT ?role (afn:localname(?role) AS ?roleName) + SELECT DISTINCT ?role ?roleLabel ?activity ?activityName ?dateTimeStart ?dateTimeEnd WHERE { @@ -35,7 +35,7 @@ PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> SELECT DISTINCT ?subclass - ?role (afn:localname(?role) AS ?roleName) + ?role ?roleLabel ?activity ?activityName ?dateTimeStart ?dateTimeEnd WHERE { diff --git a/productMods/config/listViewConfig-informationResourceInAuthorship.xml b/productMods/config/listViewConfig-informationResourceInAuthorship.xml index 3e2abdd4..4980c8b1 100644 --- a/productMods/config/listViewConfig-informationResourceInAuthorship.xml +++ b/productMods/config/listViewConfig-informationResourceInAuthorship.xml @@ -9,7 +9,7 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> - SELECT DISTINCT ?authorship (afn:localname(?authorship) AS ?authorshipName) + SELECT DISTINCT ?authorship ?person ?personName WHERE { ?subject ?property ?authorship OPTIONAL { ?authorship core:authorRank ?rank } @@ -26,7 +26,7 @@ PREFIX foaf: <http://xmlns.com/foaf/0.1/> SELECT DISTINCT ?subclass - ?authorship (afn:localname(?authorship) AS ?authorshipName) + ?authorship ?person ?personName WHERE { ?subject ?property ?authorship OPTIONAL { ?authorship core:authorRank ?rank } diff --git a/productMods/config/listViewConfig-organizationForPosition.xml b/productMods/config/listViewConfig-organizationForPosition.xml index d3d63d44..c7abc188 100644 --- a/productMods/config/listViewConfig-organizationForPosition.xml +++ b/productMods/config/listViewConfig-organizationForPosition.xml @@ -9,7 +9,7 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> - SELECT DISTINCT ?position (afn:localname(?position) AS ?positionName) + SELECT DISTINCT ?position ?positionTitle ?person ?personName ?dateTimeStart ?dateTimeEnd WHERE { @@ -38,7 +38,7 @@ PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> SELECT DISTINCT ?subclass - ?position (afn:localname(?position) AS ?positionName) + ?position ?positionTitle ?person ?personName ?dateTimeStart ?dateTimeEnd WHERE { diff --git a/productMods/config/listViewConfig-personInPosition.xml b/productMods/config/listViewConfig-personInPosition.xml index bbe9d95d..6db9b722 100644 --- a/productMods/config/listViewConfig-personInPosition.xml +++ b/productMods/config/listViewConfig-personInPosition.xml @@ -9,7 +9,7 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> - SELECT DISTINCT ?position (afn:localname(?position) AS ?positionName) + SELECT DISTINCT ?position ?positionTitle ?hrJobTitle ?org ?orgName @@ -37,7 +37,7 @@ PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> SELECT DISTINCT ?subclass - ?position (afn:localname(?position) AS ?positionName) + ?position ?positionTitle ?hrJobTitle ?org ?orgName diff --git a/productMods/config/listViewConfig-relatedRole.xml b/productMods/config/listViewConfig-relatedRole.xml index 73ea19d8..a4085f00 100644 --- a/productMods/config/listViewConfig-relatedRole.xml +++ b/productMods/config/listViewConfig-relatedRole.xml @@ -9,7 +9,7 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> - SELECT DISTINCT ?role (afn:localname(?role) AS ?roleName) + SELECT DISTINCT ?role ?roleLabel ?roleTypeLabel ?indivInRole (afn:localname(?indivInRole) AS ?indivName) ?indivLabel @@ -48,7 +48,7 @@ PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> SELECT DISTINCT ?subclass - ?role (afn:localname(?role) AS ?roleName) + ?role ?roleLabel ?roleTypeLabel ?indivInRole (afn:localname(?indivInRole) AS ?indivName) ?indivLabel diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl index c965a5ab..851aea43 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl @@ -16,7 +16,7 @@ ${statement.infoResourceName} <#else> <#-- This shouldn't happen, but we must provide for it --> - ${statement.authorshipName} (no linked information resource) + missing information resource diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl index c1254b6a..b0a7a410 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl @@ -5,7 +5,7 @@ <#import "lib-datetime.ftl" as dt> <#if ! statement.valueStart?? && ! statement.valueEnd??> - ${statement.intervalName} (incomplete date/time interval data) + incomplete date/time interval <#else> ${dt.dateTimeIntervalLong("${statement.dateTimeStart!}", "${statement.precisionStart!}", "${statement.dateTimeEnd!}", "${statement.precisionEnd!}")} \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl index ad526a59..d6122d45 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl @@ -6,7 +6,7 @@ <#-- No core:dateTime data property assigned. Display a link to the core:DateTimeValue object --> <#if ! statement.dateTime??> - ${statement.dateTimeValueName} (incomplete date/time data) + incomplete date/time <#else> ${dt.formatXsdDateTimeLong(statement.dateTime, statement.precision!)} \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl index 991a1622..1e0e4670 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl @@ -27,7 +27,7 @@ ${statement.orgName} <#else> <#-- This shouldn't happen, but we must provide for it --> - ${statement.edTrainingName} (no linked organization) + missing organization diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl index d924d9e1..fb19fc5a 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl @@ -16,7 +16,7 @@ ${statement.activityLabel!statement.activityName} <#else> <#-- This shouldn't happen, but we must provide for it --> - ${statement.roleName} (no linked activity) + missing activity diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl index c4001f87..1ec51f00 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl @@ -13,6 +13,6 @@ ${statement.personName} <#else> <#-- This shouldn't happen, but we must provide for it --> - ${statement.authorshipName} (no linked author) + missing author \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl index 26a9a909..b7957428 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl @@ -16,7 +16,7 @@ ${statement.personName} <#else> <#-- This shouldn't happen, but we must provide for it --> - ${statement.positionName} (no linked person) + missing person in this position diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl index 2f9d6ef4..2f659aca 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl @@ -16,7 +16,7 @@ ${statement.orgName} <#else> <#-- This shouldn't happen, but we must provide for it --> - ${statement.positionName} (no linked organization) + missing organization diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl index 880c366f..5d7d7793 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl @@ -16,7 +16,7 @@ ${statement.indivLabel!statement.indivName} <#else> <#-- This shouldn't happen, but we must provide for it --> - ${statement.roleName} (no linked individual in this role) + missing person in this role From 4528f22109ab2624a800e311d9a938ef82bcd996 Mon Sep 17 00:00:00 2001 From: nac26 Date: Wed, 9 Feb 2011 06:01:06 +0000 Subject: [PATCH 379/427] Syntax cleanup --- themes/wilma/templates/page.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl index cdfc450e..5e4577f4 100644 --- a/themes/wilma/templates/page.ftl +++ b/themes/wilma/templates/page.ftl @@ -12,7 +12,7 @@ <#include "identity.ftl"> <#include "menu.ftl"> - + ${body} <#include "footer.ftl"> From 7d4877d8361be82a5480797c9a6d4f920cf6d2c9 Mon Sep 17 00:00:00 2001 From: nac26 Date: Wed, 9 Feb 2011 06:04:24 +0000 Subject: [PATCH 380/427] Added styles based on ${bodyClasses}: * home page - #intro
expands when logged in (to fill area left behind by #login) * login page - login form is now aligned left --- themes/wilma/css/wilma.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index 0caed21c..c90e44d4 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -498,7 +498,9 @@ ul#main-nav { width: 570px; padding-bottom: 40px; } - +body.loggedIn #intro { + width: 98%; +} #intro h2 { padding: 35px 0 12px 24px; border-bottom: none; @@ -524,6 +526,9 @@ ul#main-nav { overflow: hidden; margin-top: 20px; } +body.login #login { + float: none; +} #login h2 { font-size: 22px; color: #2485ae; From 68ff3b5a6fc6e43fbde323777240cc6b3f45f38d Mon Sep 17 00:00:00 2001 From: sjm222 Date: Wed, 9 Feb 2011 14:30:39 +0000 Subject: [PATCH 381/427] using native uri for ResearchOpportunity class --- .../WEB-INF/filegraph/tbox/scires-1.2.owl | 10 +- .../WEB-INF/filegraph/tbox/vivo-core-1.2.owl | 2592 ++++++++--------- .../user/vivo-core-1.2-annotations.rdf | 16 +- productMods/WEB-INF/submodels/scires-1.2.owl | 10 +- .../WEB-INF/submodels/vivo-core-1.2.owl | 2592 ++++++++--------- 5 files changed, 2610 insertions(+), 2610 deletions(-) diff --git a/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl b/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl index f3d89731..9858056b 100644 --- a/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl +++ b/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl @@ -13,11 +13,6 @@ xmlns:j.5="http://purl.org/dc/terms/" xmlns:xsd="http://www.w3.org/2001/XMLSchema#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > - - - - - @@ -26,6 +21,11 @@ + + + + + diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl index 7d9ff778..a04efb10 100644 --- a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl +++ b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl @@ -25,16 +25,6 @@ A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available in PubMed Central. The PMCID is issued shortly after the PI or author approves the PubMed Central formatted web version of the submission. - - - - - - - - - - http://purl.org/ontology/bibo/ Short Definition from bibo ontology @@ -48,11 +38,6 @@ - - - - - @@ -64,17 +49,32 @@ - - - - - + + + + + + + + 1 + + + + + 1 + + + + + + + For individual seminars, use seminar instead. core:ConferenceSeries and core:SeminarSeries are very similar. @@ -82,14 +82,19 @@ An organized series of a meeting for an exchange of ideas, typically put on by a department or center. - - - - - + + + + + + + + + + unstable @@ -105,11 +110,6 @@ - - - 1 - - @@ -132,14 +132,9 @@ + - - - - - - - + @@ -150,15 +145,25 @@ Accounting & Research Services Assistant; Director of Information Technology Staff, support, and other non-academic positions. - + A position classified as professional, staff, support, or any other non-academic role - + + + + 1 + + + + + + 2 + http://purl.org/ontology/bibo/ A sub property of identifier (http://en.wikipedia.org/wiki/SICI). @@ -167,9 +172,19 @@ Serial Item and Contribution Identifier - + - + 1 + + + + + + + + + + @@ -181,11 +196,6 @@ - - - - - Definition take from: http://en.wikipedia.org/wiki/Government_agency. United States Library of Congress @@ -200,11 +210,6 @@ Public description modified from the information on this page: http://www.w3.org/TR/2005/WD-swbp-skos-core-guide-20050510/#sechierarchy . - - - - - @@ -234,49 +239,64 @@ + + + 1 + + Definition take from: http://xmlns.com/foaf/spec/#term_based_near . foaf indicates that the status of this term is "unstable". "The based_near relationship relates two "spatial things" (anything that can be somewhere), the latter typically described using the geo:lat / geo:long geo-positioning vocabulary (http://www.w3.org/2003/01/geo/wgs84_pos#). This allows us to say describe the typical latitute and longitude of, say, a Person (people are spatial things - they can be places) without implying that a precise location has been given." Used to link an agent, related to bibliographic things, to a place where it is based near: can be a city, a monument, a building, etc. - + - - + 1 + Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - - - - - The most general classification of a person - + The most general classification of a person + - - - - - 1 - + + + + + + + + + + + + 1 - + + + + + + + + + + + http://purl.org/ontology/bibo/ @@ -297,25 +317,10 @@ - + - - - - - - - - - - - - - - - - - + 1 + @@ -325,20 +330,25 @@ http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - - - 1 - - + - - + + + + + + 1 - + + + + + + @@ -359,17 +369,17 @@ - - - - - + + + 1 + + Smaller administrative division into which a country may be divided. @@ -379,26 +389,24 @@ - - + + - - - + @@ -408,48 +416,20 @@ + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - + + + @@ -468,11 +448,6 @@ - - - - - http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -486,10 +461,10 @@ http://www.fao.org/termportal/contr/fr/ FAO terminology - + - - + 1 + 2010-06-24 @@ -518,36 +493,11 @@ - - - - - - - - - - - - - - - Audiovisual recording in video format - - - 1 - - - - - - - Short Definition from the bibo ontology @@ -557,10 +507,10 @@ http://purl.org/ontology/bibo/ something that is printed or published and distributed, esp. a given number of a periodical - - - + + + @@ -570,11 +520,6 @@ An explicit individual period considered by an academic institution to be its primary academic cycle. - - - - - @@ -594,11 +539,6 @@ - - - - - UN Statistics Division http://unstats.un.org/unsd/methods/m49/m49alpha.htm @@ -609,16 +549,6 @@ UN Statistics Division - - - - - - - - - - http://faostat.fao.org http://faostat.fao.org @@ -629,51 +559,26 @@ http://faostat.fao.org/default.aspx?lang=es FAOSTAT http://faostat.fao.org - - - - - - - - - - - - - - - - - - 1 - - Currently being used by a restriction on organization. - + - - + + A short written piece focused on an event or announcement of note, having a defined publication time and of less enduring interest than a news feature. - - - - - @@ -706,7 +611,7 @@ - + Authorship of journal articles, books and other original works is a means by which academics communicate the results of their scholarly work, establish priority for their discoveries, and build their reputation among their peers. This class allows for linking an author to a publication while indicating information about that author's authorship. Contains the authors name, their rank in the publication, and whether or not they are a corresponding author on the publication. @@ -720,31 +625,6 @@ This class allows for linking an author to a publication while indicating inform Bibo Definition: A seminar, discussion group, or the like, that emphasizes exchange of ideas and the demonstration and application of techniques, skills, etc. - - - - - - - - 1 - - - - - 1 - - - - - - - - - - 1 - - @@ -763,18 +643,13 @@ This class allows for linking an author to a publication while indicating inform stable - Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio Independent organizations formally working together toward a common goal, under an expressed agreement - + + - - - 1 - - @@ -782,20 +657,20 @@ This class allows for linking an author to a publication while indicating inform - + - + A group of related documents issued at regular intervals. - http://purl.org/ontology/bibo/ + stable - + - + - 1 - + 1 + @@ -825,11 +700,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - A large contiguous landmass that is at least partially surrounded by water, together with any islands on its continental shelf. @@ -837,20 +707,20 @@ This class allows for linking an author to a publication while indicating inform Short Definition take from http://en.wiktionary.org/wiki/continent. - + - - + 1 + - - + + - + http://www.fao.org/termportal/contr/zh/ @@ -865,16 +735,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ 2010-06-24 - - - - - - - - 1 - - @@ -895,11 +755,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - @@ -912,15 +767,20 @@ This class allows for linking an author to a publication while indicating inform - + + + - - + + + + + This is done through a restriction on academic degree to allow the values from to be foaf:organization to be used as the range. @@ -966,10 +826,10 @@ This class allows for linking an author to a publication while indicating inform - + - - + + A unit devoted primarily to extension activities, whether for outreach or research. @@ -997,19 +857,14 @@ This class allows for linking an author to a publication while indicating inform - - - + + + - + - 1 - - - - - 1 - + + @@ -1026,6 +881,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + Something designed, built, installed, etc., to serve a specific function or activity affording a convenience or service. Distinct from the organization that runs it; e.g., a laboratory may be an organization but may be run by another organization and only consist of facilities housing equipment or services. Can be a building or place that provides a particular service or is used for a particular activity. Use the specific Building or Room whenever possible. Short definition from http://dictionary.reference.com/browse/facility. @@ -1033,20 +893,20 @@ This class allows for linking an author to a publication while indicating inform Use subclasses of core:Facility subclasses instead of this class if possible + + + + + A gathering of people for a defined purpose, not necessarily public or announced - + + - - - - - - @@ -1055,11 +915,6 @@ This class allows for linking an author to a publication while indicating inform Regularly updated online journal or newsletter by one or more writers, called bloggers, containing articles and commentary of interest to the blogger - - - 1 - - @@ -1079,11 +934,6 @@ This class allows for linking an author to a publication while indicating inform Public Description from source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers the bibo:presents and the bibo:presentedAt unstable terms. It also indicates that bibo:presents is a sub-property of event:product. - - - 1 - - 2010-06-24 @@ -1098,6 +948,11 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/es/ + + + 1 + + @@ -1115,10 +970,10 @@ This class allows for linking an author to a publication while indicating inform Either city or town - a thickly populated area having fixed boundaries and certain local powers of government. - + + - 1 - + @@ -1130,20 +985,20 @@ This class allows for linking an author to a publication while indicating inform That is a position held by an academic faculty member who works for administration. - + - + Associate Dean An academic administrative position (associate dean, etc.) as distinct from a professional administrative position (non-academic) - server; Bruker Vector-33 FT-IR + A network server is one example. Medical schools and research laboratories can list professional equipment, such as microscopes. - + A physical object provided for specific purpose, task or occupation. - + @@ -1155,25 +1010,25 @@ This class allows for linking an author to a publication while indicating inform + http://purl.org/ontology/bibo/ A specific journal article - + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a periodical or book + Short Definition modified from the bibo ontology. - A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine. stable - - Director of Admissions and Placement; Associate University Librarian Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. + - An employment activity, whether compensated or not. Short definition comes from http://en.wikipedia.org/wiki/Position, and has been modified. + @@ -1185,16 +1040,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - - - - - - The thesis degree. @@ -1205,12 +1050,22 @@ This class allows for linking an author to a publication while indicating inform The source of the public description and this info is found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html. Bibo considers this term "unstable". The bibo editorial note is: "We are not defining, using an enumeration, the range of the bibo:degree to the defined list of bibo:ThesisDegree. We won't do it because we want people to be able to define new degress if needed by some special usecases. Creating such an enumeration would restrict this to happen." + + + + + + - An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials + + + + + @@ -1223,15 +1078,15 @@ This class allows for linking an author to a publication while indicating inform - - - - - + + + + + Relates a document to an event; for example, a paper to a conference. @@ -1255,11 +1110,6 @@ This class allows for linking an author to a publication while indicating inform 2009-04-30 http://faostat.fao.org/DesktopDefault.aspx?PageID=377&lang=es#ancor - - - - - Public Definition source (http://www.answers.com/topic/publisher). @@ -1271,11 +1121,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - @@ -1288,10 +1133,15 @@ This class allows for linking an author to a publication while indicating inform - + 1 - + + + + + 1 + @@ -1304,14 +1154,29 @@ This class allows for linking an author to a publication while indicating inform http://faostat.fao.org/DesktopDefault.aspx?PageID=550&lang=es#ancor 2009-09-21 + + + + + + + + + + US Patent Data; US Job Data A named collection of data, usually containing only one type of data + + + + + - + Computer program and its related documentation; directs the operation of a computer @@ -1349,6 +1214,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + http://www.fao.org/termportal/contr/es/ @@ -1363,6 +1233,16 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 http://www.fao.org/termportal/contr/en/ + + + 1 + + + + + 1 + + My extension program consists of developing and reporting disease management strategies that are both economically and environmentally sound for fresh market vegetable production. We hope that some of this testing will result in practices adaptable for organic production. @@ -1395,11 +1275,26 @@ This class allows for linking an author to a publication while indicating inform An activity of an individual within his or her profession or institution; use outreach provider role for community service or other activities outside the profession. + + + 1 + + Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. + + + 1 + + + + + + + @@ -1418,17 +1313,37 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 FAO terminology + + + 1 + + + + + + + + + + + + + stable + A scholarly academic article, typically published in a journal. - http://purl.org/ontology/bibo/ Written by scholars for other scholars, typically published in an academic journal with an abstract and bibliography - A specific academic journal article + + + 1 + + @@ -1440,6 +1355,16 @@ This class allows for linking an author to a publication while indicating inform + + + + + + + + 1 + + stable @@ -1454,6 +1379,11 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ + + + + + http://www.un.org/Depts/Cartographic/english/htmain.htm http://www.un.org/Depts/Cartographic/english/htmain.htm @@ -1465,17 +1395,42 @@ This class allows for linking an author to a publication while indicating inform http://www.un.org/Depts/Cartographic/french/htmain.htm UN Cartographic Section + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - http://purl.org/dc/terms/ http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html @@ -1484,6 +1439,16 @@ This class allows for linking an author to a publication while indicating inform A summary of the resource. stable + + + + + + + + + + Role of a person designated by a grantee to direct a project or activity being supported by a grant, and who is accountable to the grantee for the proper conduct of the project or activity. Also known as Program Director or Project Director. @@ -1509,11 +1474,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/en/ - - - 1 - - http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -1554,8 +1514,8 @@ This class allows for linking an author to a publication while indicating inform Definition taken from: http://en.wikipedia.org/wiki/University University of Florida; Washington University in St. Louis - An institution of higher education and research, which grants academic degrees in a variety of subjects, and provides both undergraduate education and postgraduate education. + @@ -1563,54 +1523,79 @@ This class allows for linking an author to a publication while indicating inform Definition from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html + + + + + + + + + + + + + + + + + + + + + + + + + Top level of all location classes. It's anticipated that the subclasses will be used when classifying items. And, all locations can be viewable via this class. Use subclasses of core:Location when classsifying items. - + - - + + + + + + + A document created as a basis for discussion or a very early draft of a formal paper - - - - - - 1 - + + - - - - - + + + Used for a single narrative summary of teaching, typically covering a wide range of courses including for credit and non-credit teaching over multiple semesters; the "teaches" property links a person directly with an instance of a Semester Class, typically from an institutional database of record; then use Teacher Role for information about a person's role in non-credit teaching or their specific contribution to individual courses + + + - - - Used for a single narrative summary of teaching, typically covering a wide range of courses including for credit and non-credit teaching over multiple semesters; the "teaches" property links a person directly with an instance of a Semester Class, typically from an institutional database of record; then use Teacher Role for information about a person's role in non-credit teaching or their specific contribution to individual courses - - + + + + source: http://en.wikipedia.org/wiki/Issn @@ -1620,6 +1605,11 @@ This class allows for linking an author to a publication while indicating inform International Standard Serial Number + + + + + @@ -1627,6 +1617,21 @@ This class allows for linking an author to a publication while indicating inform source of definition: http://www.uspto.gov/main/glossary/#p . The following site has patent number formats: http://www.uspto.gov/patents/ebc/kindcodesum.jsp . + + + + + + + + + + + + + + + @@ -1635,6 +1640,7 @@ This class allows for linking an author to a publication while indicating inform + http://purl.org/ontology/bibo/ @@ -1643,7 +1649,6 @@ This class allows for linking an author to a publication while indicating inform A periodical of scholarly journal Articles. Contains original scholarly research or review articles by experts in the field Journal of Information Science; IEEE Intelligent System; Scientometrics - http://purl.org/ontology/bibo/ @@ -1654,10 +1659,20 @@ This class allows for linking an author to a publication while indicating inform Contains news articles, opinions, features, advertising, and is usually issued daily or weekly - + + - 1 - + + + + + + + + + + + @@ -1681,20 +1696,20 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - - - + + + + - - + + + + + + + + @@ -1708,15 +1723,15 @@ This class allows for linking an author to a publication while indicating inform - - - + + + - Wiley Prize in Biomedical Sciences + An Award or Honor An Award or Honor @@ -1733,10 +1748,25 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + + + + + + + + + + + + + + + + @@ -1753,20 +1783,20 @@ This class allows for linking an author to a publication while indicating inform An agent that receives a communication document. - - - - - - - - + + + + + Only use if no specific subclasses of core:EventSeries desribe the activity. - - - A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. + + + + Two or more events that follow on one after the other or are connected one after the other. + + @@ -1776,20 +1806,20 @@ This class allows for linking an author to a publication while indicating inform - - - + + 1 + - + - - + + @@ -1810,15 +1840,10 @@ This class allows for linking an author to a publication while indicating inform use one freetextKeyword assertion for each keyword or phrase. - + + + - - - - - - - @@ -1826,16 +1851,6 @@ use one freetextKeyword assertion for each keyword or phrase. We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - - - 1 - - - - - - - @@ -1847,29 +1862,19 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - - - - + Represents educational training that has been received. This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree. + Currently any abstract name is given to individuals of this class. This could change in the future. - - + A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue + - @@ -1877,21 +1882,21 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + http://purl.org/ontology/bibo/ - Facebook; VIVOweb.org; Flickr A group of Webpages accessible on the Web. A group of webpages available within a specific parent address or URL on the World Wide Web + unstable - - - - - FAO terminology @@ -1909,9 +1914,9 @@ We would like the range of core:outcome to be the union of Event and Process; an Work consisting of collections of previously published works + Short Definition is the Medical Subject Heading (MeSH) definition A document that simultaneously contains other documents. - http://purl.org/ontology/bibo/ stable @@ -1925,11 +1930,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + An area of corporate activity organized as an administrative or functional unit. Definition modified from http://www.thefreedictionary.com/division. It is difficult to tell the difference between a division and a department. Cardiovascular Medicine (division within medicine) - The Ornithological Newsletter @@ -1937,15 +1942,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - 1 - - - - - - + + @@ -1953,16 +1953,11 @@ We would like the range of core:outcome to be the union of Event and Process; an The bibo:reviewOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . As of 26 May 2010, bibo:reviewOf is used with the class Review, but core:reviewIn doesn't seem to be being used. - - 1 - - - VIVO Outreach Team; VIVO Ontology Team - An informal organization brought together for the purposes of a project or event. + @@ -1971,16 +1966,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - 1 - - @@ -2008,10 +1993,10 @@ We would like the range of core:outcome to be the union of Event and Process; an The academic degree of a Thesis + Alchohol Education Center; Center for Arts and Public Policy; Hearing Research Center - A place where a particular activity or service is concentrated. Short Definition take from http://www.thefreedictionary.com/center. @@ -2026,15 +2011,25 @@ We would like the range of core:outcome to be the union of Event and Process; an http://faostat.fao.org/site/377/default.aspx FAOSTAT http://faostat.fao.org/site/377/default.aspx - + 1 - + Indicates the precision of the value of a DateTimeValue instance. + + + + + + + + + + For example an HR job title for a person might be - Assistant University Librarian, and the preferred job title for that same person could be - Physical Sciences Librarian. @@ -2044,13 +2039,13 @@ We would like the range of core:outcome to be the union of Event and Process; an + Short Definition from OCLC Input Standards, EntW A document created to summarize research findings associated with the completion of an academic degree. - stable http://purl.org/ontology/bibo/ Works created to satisfy the requirements for an academic certification or degree; also called dissertation - + @@ -2060,22 +2055,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - 1 - - UN Statistics Division @@ -2089,17 +2074,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - Only use if no specific subclasses of core:Role describe the role. - + + A person's or organization's type of contribution to an endeavor - Only use this broad role class if no subclasses of role describe the item being classified. @@ -2107,16 +2087,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - 1 - - @@ -2130,6 +2100,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + @@ -2142,11 +2117,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ unstable - - - 1 - - @@ -2154,10 +2124,10 @@ We would like the range of core:outcome to be the union of Event and Process; an UN Cartographic Section + A structured file of information or a set of logically related data stored and retrieved using computer-based means Short Definition is the Medical Subject Heading (MeSH) definition - PubMed @@ -2167,8 +2137,17 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + + + + + + - stable http://purl.org/ontology/bibo/ A meeting for consultation or discussion. @@ -2177,11 +2156,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A meeting for consultation or discussion. - - - - 1 - + @@ -2191,40 +2166,30 @@ We would like the range of core:outcome to be the union of Event and Process; an + A distinct, usually ongoing and specialized unit within a large organization. Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division. - Legal (department within a company); Use for any non-academic department - + - - - - - - - - - - - - + + An online article or commentary appearing on a blog - + A specific blog posting Collection of documents or information resources that have a unified identity - stable + Collection of documents or information resources that have a unified identity. Archives, museums and libraries often acquire collections on specific subjects and from distinguished authors or researchers. Also includes collections of resources bundled into a license. http://purl.org/ontology/bibo/ Hill Ornithology Collection; Wiley Interscience Online Books Biochemisty Collection @@ -2247,11 +2212,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition obtained here: http://answers.ask.com/Business/Finance/what_is_a_private_company. Examples of private companies found here: http://www.forbes.com/2008/11/03/largest-private-companies-biz-privates08-cx_sr_1103private_land.html - - - - - @@ -2260,10 +2220,10 @@ We would like the range of core:outcome to be the union of Event and Process; an B.A. Bachelor of Arts - This list may have multiple abbreviations for some degrees. An academic degree at any level, both as reported by individuals for employment and as offered by academic degree programs. - + + @@ -2281,6 +2241,11 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal document proposing or enacting a law or a group of laws. + + + 1 + + Minnesota; Michigan; Indiana; New York; Quebec; Manitoba; Ontario Source of the Short Definition: http://www.thefreedictionary.com/state. @@ -2311,14 +2276,19 @@ We would like the range of core:outcome to be the union of Event and Process; an + - phonograph record; tape; CD; DVD; DAT An audio document; aka record. http://purl.org/ontology/bibo/ stable Recorded audio in any format + + + + + http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49chgef.htm @@ -2332,11 +2302,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - A document containing an authoritative determination (as a decree or judgment) made after consideration of facts or law. @@ -2345,16 +2310,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ - - - 1 - - - - - - - FAO terminology @@ -2373,8 +2328,8 @@ We would like the range of core:outcome to be the union of Event and Process; an film; video; Blu-ray Audiovisual recording in any format + - stable An audio-visual document; film, video, and so forth. @@ -2393,6 +2348,11 @@ We would like the range of core:outcome to be the union of Event and Process; an A location having coordinates in geographic space. + + + 1 + + Text of a speech written in preparation for delivery of the speech. @@ -2422,6 +2382,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + UN cartographic maps (http://www.un.org/Depts/Cartographic/map/profile/world.pdf) @@ -2441,11 +2406,6 @@ We would like the range of core:outcome to be the union of Event and Process; an stable - - - 1 - - @@ -2454,17 +2414,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - A defined class of organizations that fund Grants. + National Institute of Health (NIH) - - - - - @@ -2473,29 +2428,24 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition found here: http://dictionary.reference.com/browse/publisher A person or company whose business is the publishing of books, periodicals, engravings, computer software, etc. - Elsevier; Harper & Row; Indiana University Press - - - - - - - - - - - - - - - + + + + + + + + + 1 + + A student organization is an organization, operated by students at a university, whose membership normally consists only of students. Dancin' Gators @@ -2516,15 +2466,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - - - - - - + + @@ -2539,16 +2484,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/fr/ - - - - - - - - - - @@ -2558,16 +2493,11 @@ We would like the range of core:outcome to be the union of Event and Process; an The full URL. + Uniform Resource Locator (URL) specifies where an identified resource is available and the mechanism for retrieving it. - http://info.slis.indiana.edu/~katy/ - - - 1 - - @@ -2586,11 +2516,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - @@ -2599,10 +2524,10 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable - + - - + 1 + http://www.fao.org/termportal/contr/ar/ @@ -2624,6 +2549,16 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + + + + + + Short Definition copied from bibo ontology @@ -2639,31 +2574,51 @@ We would like the range of core:outcome to be the union of Event and Process; an Public Definition source (http://www.answers.com/topic/publisher). + + + + + An Institute normally has a research focus but may also fulfill instructional or outreach roles. Institute for Fundamental Theory + + + 1 + + - - This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. - Only use if no specific subclasses of foaf:organization desribe the organization. - + A generic class encompassing several types of organizations. - - + + + + + - + Ued to describe an organization related to bibliographic items such as a publishing company, etc. - + + + + + + + + + + + + + - - http://www.fao.org/termportal/contr/fr/ @@ -2697,11 +2652,31 @@ We would like the range of core:outcome to be the union of Event and Process; an definition modified from: source (http://en.wikipedia.org/wiki/Seating_capacity). 55 + + + + + + + + + + + + + + + The digital file (or physical equivalent), if available after the conference, vs. the act of attending/presenting: use ConferencePresentation for information about date/time/location/name of the event where the poster was presented + + + 1 + + An organized series of workshop events, whether repetitions of the same workshop or multiple different workshops. Use workshop for individual events. @@ -2713,17 +2688,27 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + + + + + + + + 1 + + + - - - - - @@ -2731,23 +2716,23 @@ We would like the range of core:outcome to be the union of Event and Process; an + + Only use if no specific subclasses of event:Event are appropriate. + + + This class will also display instances of subclasses under Event, e.g. Philosophy Department Discussion Club; 2009 Racker Lecture; screening of a documentary. In addition to a location in space and time, an event may have any or all the following qualities: actively participating agents, passive factors, work products. Also, it may be in a virtual space or part of a series such as a lecture series. The previous short definition was: "An arbitrary classification of a space/time region, by a cognitive agent." + + + + - - - - Something that happens at a given place and time. - - - - - - - + + @@ -2757,6 +2742,11 @@ The previous short definition was: "An arbitrary classification of a space/time http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet + + + + + http://www.fao.org/termportal/en/ @@ -2776,6 +2766,11 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + @@ -2806,17 +2801,22 @@ The previous short definition was: "An arbitrary classification of a space/time - + - - + + + + + + + - - + An award, honor, or distinction received by a person on a particular date (not the award itself as given repeatedly, and not a grant award). - + + A specific award on a particular date or for a particular date range. Ninth annual Wiley Prize in Biomedical Sciences, for the discovery of a light activated ion channel @@ -2836,11 +2836,6 @@ The previous short definition was: "An arbitrary classification of a space/time Draft legislation presented for discussion to a legal body. stable - - - - - @@ -2853,13 +2848,28 @@ The previous short definition was: "An arbitrary classification of a space/time Role of co-principal investigator of a grant, who devotes a specified percentage of time and is considered key personnel. + + + + + + + + + + + + + + + Professor, associate professor and assistant professor are common positions for academic faculty. - Professor; Associate Professor; Assistant Professor Academic position in a university or institution - + + @@ -2874,12 +2884,17 @@ The previous short definition was: "An arbitrary classification of a space/time The dual relationship of a professor advising a student and the student being advised by a professor, typically including start and end dates - + - + + + + + + 1 - + @@ -2891,16 +2906,6 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - - - - - - @@ -2922,11 +2927,6 @@ modern society using the world of Star trek. Los Angeles Times, March An section number - - - - - @@ -2950,6 +2950,11 @@ modern society using the world of Star trek. Los Angeles Times, March This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. + + + + + http://purl.org/ontology/bibo/ @@ -2958,10 +2963,15 @@ modern society using the world of Star trek. Los Angeles Times, March An agent that interview another agent. - + - - + 1 + + + + + + @@ -2970,15 +2980,10 @@ modern society using the world of Star trek. Los Angeles Times, March - - + - - - - - - + 1 + @@ -2992,15 +2997,15 @@ modern society using the world of Star trek. Los Angeles Times, March a specific period or duration, defined by (optional) start and end date/times. - + - 1 - + + - + + + - - @@ -3018,10 +3023,15 @@ modern society using the world of Star trek. Los Angeles Times, March Short Definition from bibo ontology - + + + + + + 1 - + @@ -3033,11 +3043,6 @@ modern society using the world of Star trek. Los Angeles Times, March - - - - - FAO terminology FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -3057,11 +3062,6 @@ modern society using the world of Star trek. Los Angeles Times, March - - - - - @@ -3074,11 +3074,6 @@ modern society using the world of Star trek. Los Angeles Times, March - - - 1 - - @@ -3099,8 +3094,23 @@ Examples of a Publisher include a person, an organization, or a service. Typical - - + 1 + + + + + + + + + + + + + + + + FAO terminology @@ -3140,6 +3150,11 @@ Examples of a Publisher include a person, an organization, or a service. Typical A presentation of a series of slides, usually presented in front of an audience with written text and images. stable + + + 1 + + @@ -3172,11 +3187,6 @@ Examples of a Publisher include a person, an organization, or a service. Typical http://purl.org/ontology/bibo/ - - - - - http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -3190,35 +3200,35 @@ Examples of a Publisher include a person, an organization, or a service. Typical 2010-06-24 - - - 1 - - Resource dependent on other entities This class is here so it can be equivalent to vitro:DependentResource. Deletion in the VIVO system behaves differently when deleting members of this class: related individuals may need to be deleted as well. - - - - - - - - - - A distinct, usually specialized educational unit within an educational organization. - - + + Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts) + + + 1 + + + + + + + + + + + + @@ -3226,11 +3236,6 @@ Examples of a Publisher include a person, an organization, or a service. Typical RearcherID is a Thomson Reuters project where researchers have a place to manage and share their professional information. It will allow them to solve author identity issues while simultaneously adding dynamic citation metrics and collaboration networks to your personal profile. Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3249,11 +3254,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/A passage selected from a larger work. http://purl.org/ontology/bibo/ - - - - - @@ -3263,28 +3263,33 @@ Definition source: http://isiwebofknowledge.com/researcherid/Critical or explanatory note for a Document. + + + + + + + + 1 + + - + + An intramural or extramural award to support scholarly work, such as UF09179 (VIVO) Short definition is from the Glossary of NIH Terms. - + + Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity - - - + Written musical composition for voice or instruments or both - - - 1 - - 2010-06-24 http://www.fao.org/termportal/contr/ar/ @@ -3298,11 +3303,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - - - @@ -3318,10 +3318,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Information Science; Computer Science; Anthropology - + + - - + This namespace - http://purl.org/dc/elements/1.1/ - does not appear to have this element. @@ -3338,11 +3338,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - http://www.fao.org/termportal/contr/es/ http://www.fao.org/termportal/contr/fr/ @@ -3365,26 +3360,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/http://purl.org/ontology/bibo/ source for public description: http://en.wikipedia.org/wiki/Universal_Product_Code. - - - - - A person with at least one academic appointment to a specific faculty of a university or institution of higher learning. Definition from here: http://research.carleton.ca/htr/defs.php. - - + - - - - - - + + @@ -3393,36 +3378,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/Intel Talent Search; poetry contest Not the same as an award or distinction. - + + + - 1 - - + - - - - - - - - - - - - - - - - - - 1 - - @@ -3450,11 +3415,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3464,6 +3424,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ 0.7 + + + + + http://purl.org/ontology/bibo/ New Yorker @@ -3477,17 +3442,22 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Address has properties for department name, street, city, state or province, postal code, and country. For US specific address, classify using core:US Postal Code. core:Address will display all addresses. - University of Waterloo, 200 University Avenue West, Waterloo, Ontario, Canada N2L 3G1 + A code and abstract concept expressing a location on the Earth's surface. To classify US specific addresses, use core:US Postal Code. + + + + + + Librarian; Library Systems Analyst; Music Bibliographer - - It is the common position in libraries. A position held by library and information science professionals, or academic or technical experts, in support of providing information services or materials + @@ -3503,41 +3473,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/es/ - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - @@ -3553,15 +3493,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/Library of Congress Control Number Source: http://en.wikipedia.org/wiki/Library_of_Congress_Control_Number. - + + + - 1 - - + + + - - @@ -3570,26 +3510,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - - - - 1 - - - - - - - - - - - - A group can also be an organization but need not be; typically used for looser associations of people or organizations acting together in some fashion, not necessarily through formal agreement or on a long-term basis. Added to the VIVO ontology to be able to support informal and perhaps even private groups of people around an idea, funding opportunity, or event. @@ -3604,24 +3524,24 @@ Definition source: http://isiwebofknowledge.com/researcherid/A chapter of a book. A main division of a book - + 1 - + + + + + + Curriculum Steering Committee; PhD Advisory Committee - A group of people organized for a specific purpose (e.g., a reporting or advisory role), often with a charge and for a specific duration. + There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important. - - - - - Short Definition from OCLC Input Standards, EntW http://purl.org/ontology/bibo/ @@ -3650,28 +3570,18 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - 1 - - + 1320 East 10th Street, Wells Library 021 Bloomington, IN 47405 Formal address in US postal address system. - + - - + US postal address follow the format street, apt or office number (optional), city, state, and zipcode. @@ -3685,6 +3595,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + + + + 1 + + @@ -3698,21 +3618,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print. - - - 1 - - - + + + + Short Definition from the bibo ontology - unstable A section of a book - - http://purl.org/ontology/bibo/ A section of a book. @@ -3727,11 +3642,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - A court associated with a legal document; for example, that which issues a decision. @@ -3755,11 +3665,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable - - - 1 - - @@ -3774,6 +3679,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/The Getty Museum A building or place where works of art, scientific specimens, or other objects of permanent value are kept and displayed. + + + 1 + + unstable http://purl.org/ontology/bibo/ @@ -3782,6 +3692,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3801,37 +3716,12 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/fr/ - - - - - - - - - - - - - 1 - - - - - - - - - - 1 - - @@ -3842,6 +3732,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3854,6 +3749,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + + + + + + @@ -3884,16 +3789,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/Not sure how to access the "Editor's Comments". But as North America is a continent, it would be placed directly into the continent subclass and viewable through this class along with any other subclass entities. Any region that goes beyond national boundaries and does not fit into any subclass of core:TransnationalRegion. - - - - - - - - - - @@ -3901,22 +3796,12 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - - - - - - A short form for an longer title or name. @@ -3928,6 +3813,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A person holding a position that is not considered to be an academic appointment. + + + + + @@ -3935,16 +3825,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - + + + 1 + + For example, National Science Foundation providesFundingThrough Graduate Research Fellowship Program; National Institutes of Health providesFundingThrough National Center for Research Resources. @@ -3952,11 +3842,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - A location having coordinates in geographic space. @@ -3964,6 +3849,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Use subclasses of core:Geographic Location subclasses instead of this class if possible. + + + + + + + + + + @@ -3983,17 +3878,22 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + + + 1 + + - - - 1 - - An agent that is interviewed by another agent. stable @@ -4022,11 +3922,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Bacteria-resistant bandage; Termite prevention system; Hurricane resistant houses - - - - - Relates a document to some transcribed original. The bibo:transcriptOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers this term unstable. @@ -4036,11 +3931,21 @@ Definition source: http://isiwebofknowledge.com/researcherid/unstable + + + + + + + + 1 + + @@ -4050,6 +3955,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/Publication Description source http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . This term is also considered unstable. unstable + + + + + @@ -4060,6 +3970,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support + + + @@ -4090,6 +4009,16 @@ bibo has the domain of this property set to the union of Collection and Document + + + 1 + + + + + + + FAO terminology @@ -4128,14 +4057,29 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + + + + + + + + + + + - - - + + 1 + @@ -4153,10 +4097,10 @@ bibo has the domain of this property set to the union of Collection and Document - + - 1 - + + @@ -4221,18 +4165,18 @@ bibo has the domain of this property set to the union of Collection and Document - A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate - - - + + - Short Definition from the bibo ontology + stable - http://purl.org/ontology/bibo/ + + A document (noun) is a bounded physical representation of body of information designed with the capacity (and usually intent) to communicate. A document may manifest symbolic, diagrammatic or sensory-representational information. + A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate @@ -4264,6 +4208,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + Short Definition from the bibo ontology @@ -4278,6 +4227,16 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + + + + + + FAO terminology http://www.fao.org/termportal/contr/ar/ @@ -4305,28 +4264,28 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - - + 1 + - + An edited book. + http://purl.org/ontology/bibo/ + - - Best American Science Writing 2009 stable An edited collection of stand-alone articles published as a book - + - + - 1 - + + Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible. @@ -4352,45 +4311,45 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + - - - - + + + + - - - - - - + + - - - - - - - - - - - - + + - + + + + + + + + + + + + + - - - - - + + + - + - 1 - + 1 + @@ -4398,6 +4357,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Medicine + + + + + + + + 1 + + http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/ar/ @@ -4423,10 +4392,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - - + 1 + @@ -4446,18 +4415,28 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi College of Arts & Sciences; Ivy Tech Community College A primary academic unit within a University or a free-standing higher education organization without graduate degree programs. - - - - - - + Document1 isVersionOf Document2 This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. + + + + + + + + 1 + + + + + + + @@ -4482,16 +4461,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - - - - 1 - - @@ -4521,36 +4490,41 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + + + + + + 1 + + + + + + + - + - + - - + + - - - - - - - - 1 - - @@ -4558,10 +4532,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - UITS service UITS service is the information technology services provided by Indiana University. SC. + + A regularly offered service in support of an academic, research, or administrative function (not personal or professional service by an individual) @@ -4571,19 +4545,29 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + 1 + + + + + 1 + + + + + + + - - - - - Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. @@ -4596,17 +4580,17 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi The grounds of a school, college, university, or hospital. Or, a large, usually suburban, landscaped business or industrial site. + + + + + - - - - - unstable @@ -4621,10 +4605,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - + - + 1 + @@ -4632,10 +4616,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi This is done with a restriction on agent. - + - - + + Code of Federal Regulations @@ -4647,26 +4631,12 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi A work consisting of texts of rules and regulations related to statutes issued by executive or administrative agencies A collection of statutes. - - - - An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support - - - - - - - - 1 - - Used information from this definition: http://dictionary.reference.com/browse/library. + A collection of any materials, for study and enjoyment, which has been systematically arranged. - Marston Science Library @@ -4683,20 +4653,30 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ - - + - + 1 + - + - - + + - + + + + + + - + + + + + 1 + http://www.fao.org/termportal/contr/ar/ @@ -4711,6 +4691,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + 1 + + @@ -4729,11 +4714,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - - - 1 - - @@ -4745,10 +4725,20 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi full email address - + - - + 1 + + + + + + + + + + 1 + @@ -4756,14 +4746,24 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. + + + + + Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. - - - + + + - + + + + + + @@ -4771,16 +4771,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Chicago; New York; Bloomington; Gainesville - - - 1 - - - - - - 2 - @@ -4788,25 +4778,20 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - - - - - - For data ingest from authoritative sources to record the actual way a person was listed as author, as potentially valuable information for author disambiguation. - - + + + + + + + @@ -4830,19 +4815,24 @@ We would like the range of core:outcome to be the union of Event and Process; an http://aims.fao.org/website/Search-AGROVOC/sub http://aims.fao.org/website/Search-AGROVOC/sub + + + 1 + + Used to link a bibliographic item to one of its contributor: can be an author, an editor, a publisher, etc. - + - - + 1 + - + - - + + @@ -4850,11 +4840,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - @@ -4871,16 +4856,21 @@ We would like the range of core:outcome to be the union of Event and Process; an Any organization (likely also asserted as another class of Organization) with a primary, ongoing research function, not just through occasional roles - + - - + + The result of rendering a work from one language to another + + + + + @@ -4899,11 +4889,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - http://www.fao.org/figis/servlet/RefServlet http://www.fao.org/figis/servlet/RefServlet @@ -4916,12 +4901,17 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + Medical Subject Heading (MeSH) definition of Technical Report: Work consisting of a formal report giving details of the investigation and results of a medical or other scientific problem. When issued by a government agency or comparable official body, its contents may be classified, unclassified, or declassified with regard to security clearance. This publication type may also cover a scientific paper or article that records the current state or current position of scientific research and development. If so labeled by the editor or publisher, this publication type may be properly used for journal articles. - A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc.. http://purl.org/ontology/bibo/ + A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc. stable @@ -4944,16 +4934,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/es/ FAO terminology - - - - - - - - - - 2010-06-24 http://www.fao.org/termportal/en/ @@ -4967,30 +4947,35 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/fr/ + + + + + + + + + + - - - + + + - - - - + + + + - - - - - @@ -5001,15 +4986,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - 1 - + 1 + - - + + @@ -5022,17 +5007,17 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + For individual, separate conferences, use conference instead. core:ConferenceSeries and core:SeminarSeries are very similar. An organized series of a meeting for consultation or discussion. - - - - - @@ -5047,22 +5032,17 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ Short Definition from the bibo ontology - - - + - - - - - + + + A position involving academic work but without faculty status - Researcher; Academic Extension Associate; Postdoctoral Associate - + Those positions are held by people who do academic work but do not have faculty positions in universities or institutes. @@ -5090,14 +5070,19 @@ We would like the range of core:outcome to be the union of Event and Process; an An outreach or community service role directed outside a person's primary profession and institution Communicating Astronomy to the Public + + + + + stable - - A loose, thematic, collection of Documents, often Books. A thematic collection of documents, usually books, issued at regular or irregular intervals http://purl.org/ontology/bibo/ + + Methods in Molecular Biology @@ -5123,16 +5108,6 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal decision on appeal that takes action on a case (affirming it, reversing it, etc.). - - - - - - - - 1 - - CODEN became particularly common in the scientific community as a citation system for periodicals cited in technical- as well in chemistry-related publications and as a search tool in many bibliographic catalogues. @@ -5153,15 +5128,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - 1 - + 1 + - + - - + + @@ -5177,18 +5152,13 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - + Short Definition modified from the one found here: http://www.thefreedictionary.com/county. Alachua; Baker; Bradford; Kenora; Ottawa; Waterloo The largest administrative division of most states or provinces. - - - - - Home page for Scopus: http://www.scopus.com/home.url @@ -5212,40 +5182,40 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - - + 1 + - - + Short Definition from the bibo ontology + A distinct part of a larger document or collected document http://purl.org/ontology/bibo/ a distinct part of a larger document or collected document. - unstable + - + - + + Short Definition copied from bibo ontology - - + + http://purl.org/ontology/bibo/ - A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers. A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers - + stable @@ -5260,25 +5230,30 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A laboratory that exists primarily to conduct research vs. to provide services - - - - - + + + + + - - - + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. - + + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. + + + + + 1 + @@ -5286,6 +5261,16 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + 1 + + + + + 1 + + @@ -5297,11 +5282,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A URLLink that is designated (by the user or anyone else) as a primary link for the person, organization, event, etc. - - - - - @@ -5312,11 +5292,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Special Libraries Association; Association for Computing Machinery(ACM); American Medical Informatics Association(AMIA) - - - - - @@ -5325,11 +5300,21 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Note: Bibo:editor is used as the inverse of core:editorOf. Public Description for bibo:editor was obtained from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . + + + + + A postdoctoral training appointment (job) + + + + + @@ -5352,6 +5337,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + @@ -5376,6 +5366,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + @@ -5383,11 +5378,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - @@ -5396,6 +5386,16 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + + + + + + The name defining a special edition of a document. Normally its a literal value composed of a version number and words. @@ -5403,11 +5403,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://purl.org/ontology/bibo/ - - - 1 - - FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/zh/ @@ -5421,10 +5416,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/termportal/en/ 2010-06-24 - + + + 1 + + + + + - - @@ -5445,15 +5445,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49alpha.htm - + + - - + - 1 - + + @@ -5462,12 +5462,12 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + A list of items in a collection; an ordered compilation of item descriptions and sufficient information to afford access to them - NLM Catalog Short Definition is the Medical Subject Heading (MeSH) definition - + diff --git a/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf b/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf index fdffc42f..dce6254a 100644 --- a/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf +++ b/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf @@ -2092,6 +2092,14 @@ This relates a person to the description of their educational training. + + + + -1 + Research Opportunity + + -1 + -1 @@ -3114,14 +3122,6 @@ keywords - - - -1 - - -1 - - Research Opportunity - -1 diff --git a/productMods/WEB-INF/submodels/scires-1.2.owl b/productMods/WEB-INF/submodels/scires-1.2.owl index f3d89731..9858056b 100644 --- a/productMods/WEB-INF/submodels/scires-1.2.owl +++ b/productMods/WEB-INF/submodels/scires-1.2.owl @@ -13,11 +13,6 @@ xmlns:j.5="http://purl.org/dc/terms/" xmlns:xsd="http://www.w3.org/2001/XMLSchema#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > - - - - - @@ -26,6 +21,11 @@ + + + + + diff --git a/productMods/WEB-INF/submodels/vivo-core-1.2.owl b/productMods/WEB-INF/submodels/vivo-core-1.2.owl index 7d9ff778..a04efb10 100644 --- a/productMods/WEB-INF/submodels/vivo-core-1.2.owl +++ b/productMods/WEB-INF/submodels/vivo-core-1.2.owl @@ -25,16 +25,6 @@ A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available in PubMed Central. The PMCID is issued shortly after the PI or author approves the PubMed Central formatted web version of the submission. - - - - - - - - - - http://purl.org/ontology/bibo/ Short Definition from bibo ontology @@ -48,11 +38,6 @@ - - - - - @@ -64,17 +49,32 @@ - - - - - + + + + + + + + 1 + + + + + 1 + + + + + + + For individual seminars, use seminar instead. core:ConferenceSeries and core:SeminarSeries are very similar. @@ -82,14 +82,19 @@ An organized series of a meeting for an exchange of ideas, typically put on by a department or center. - - - - - + + + + + + + + + + unstable @@ -105,11 +110,6 @@ - - - 1 - - @@ -132,14 +132,9 @@ + - - - - - - - + @@ -150,15 +145,25 @@ Accounting & Research Services Assistant; Director of Information Technology Staff, support, and other non-academic positions. - + A position classified as professional, staff, support, or any other non-academic role - + + + + 1 + + + + + + 2 + http://purl.org/ontology/bibo/ A sub property of identifier (http://en.wikipedia.org/wiki/SICI). @@ -167,9 +172,19 @@ Serial Item and Contribution Identifier - + - + 1 + + + + + + + + + + @@ -181,11 +196,6 @@ - - - - - Definition take from: http://en.wikipedia.org/wiki/Government_agency. United States Library of Congress @@ -200,11 +210,6 @@ Public description modified from the information on this page: http://www.w3.org/TR/2005/WD-swbp-skos-core-guide-20050510/#sechierarchy . - - - - - @@ -234,49 +239,64 @@ + + + 1 + + Definition take from: http://xmlns.com/foaf/spec/#term_based_near . foaf indicates that the status of this term is "unstable". "The based_near relationship relates two "spatial things" (anything that can be somewhere), the latter typically described using the geo:lat / geo:long geo-positioning vocabulary (http://www.w3.org/2003/01/geo/wgs84_pos#). This allows us to say describe the typical latitute and longitude of, say, a Person (people are spatial things - they can be places) without implying that a precise location has been given." Used to link an agent, related to bibliographic things, to a place where it is based near: can be a city, a monument, a building, etc. - + - - + 1 + Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - - - - - The most general classification of a person - + The most general classification of a person + - - - - - 1 - + + + + + + + + + + + + 1 - + + + + + + + + + + + http://purl.org/ontology/bibo/ @@ -297,25 +317,10 @@ - + - - - - - - - - - - - - - - - - - + 1 + @@ -325,20 +330,25 @@ http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - - - 1 - - + - - + + + + + + 1 - + + + + + + @@ -359,17 +369,17 @@ - - - - - + + + 1 + + Smaller administrative division into which a country may be divided. @@ -379,26 +389,24 @@ - - + + - - - + @@ -408,48 +416,20 @@ + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - + + + @@ -468,11 +448,6 @@ - - - - - http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -486,10 +461,10 @@ http://www.fao.org/termportal/contr/fr/ FAO terminology - + - - + 1 + 2010-06-24 @@ -518,36 +493,11 @@ - - - - - - - - - - - - - - - Audiovisual recording in video format - - - 1 - - - - - - - Short Definition from the bibo ontology @@ -557,10 +507,10 @@ http://purl.org/ontology/bibo/ something that is printed or published and distributed, esp. a given number of a periodical - - - + + + @@ -570,11 +520,6 @@ An explicit individual period considered by an academic institution to be its primary academic cycle. - - - - - @@ -594,11 +539,6 @@ - - - - - UN Statistics Division http://unstats.un.org/unsd/methods/m49/m49alpha.htm @@ -609,16 +549,6 @@ UN Statistics Division - - - - - - - - - - http://faostat.fao.org http://faostat.fao.org @@ -629,51 +559,26 @@ http://faostat.fao.org/default.aspx?lang=es FAOSTAT http://faostat.fao.org - - - - - - - - - - - - - - - - - - 1 - - Currently being used by a restriction on organization. - + - - + + A short written piece focused on an event or announcement of note, having a defined publication time and of less enduring interest than a news feature. - - - - - @@ -706,7 +611,7 @@ - + Authorship of journal articles, books and other original works is a means by which academics communicate the results of their scholarly work, establish priority for their discoveries, and build their reputation among their peers. This class allows for linking an author to a publication while indicating information about that author's authorship. Contains the authors name, their rank in the publication, and whether or not they are a corresponding author on the publication. @@ -720,31 +625,6 @@ This class allows for linking an author to a publication while indicating inform Bibo Definition: A seminar, discussion group, or the like, that emphasizes exchange of ideas and the demonstration and application of techniques, skills, etc. - - - - - - - - 1 - - - - - 1 - - - - - - - - - - 1 - - @@ -763,18 +643,13 @@ This class allows for linking an author to a publication while indicating inform stable - Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio Independent organizations formally working together toward a common goal, under an expressed agreement - + + - - - 1 - - @@ -782,20 +657,20 @@ This class allows for linking an author to a publication while indicating inform - + - + A group of related documents issued at regular intervals. - http://purl.org/ontology/bibo/ + stable - + - + - 1 - + 1 + @@ -825,11 +700,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - A large contiguous landmass that is at least partially surrounded by water, together with any islands on its continental shelf. @@ -837,20 +707,20 @@ This class allows for linking an author to a publication while indicating inform Short Definition take from http://en.wiktionary.org/wiki/continent. - + - - + 1 + - - + + - + http://www.fao.org/termportal/contr/zh/ @@ -865,16 +735,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ 2010-06-24 - - - - - - - - 1 - - @@ -895,11 +755,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - @@ -912,15 +767,20 @@ This class allows for linking an author to a publication while indicating inform - + + + - - + + + + + This is done through a restriction on academic degree to allow the values from to be foaf:organization to be used as the range. @@ -966,10 +826,10 @@ This class allows for linking an author to a publication while indicating inform - + - - + + A unit devoted primarily to extension activities, whether for outreach or research. @@ -997,19 +857,14 @@ This class allows for linking an author to a publication while indicating inform - - - + + + - + - 1 - - - - - 1 - + + @@ -1026,6 +881,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + Something designed, built, installed, etc., to serve a specific function or activity affording a convenience or service. Distinct from the organization that runs it; e.g., a laboratory may be an organization but may be run by another organization and only consist of facilities housing equipment or services. Can be a building or place that provides a particular service or is used for a particular activity. Use the specific Building or Room whenever possible. Short definition from http://dictionary.reference.com/browse/facility. @@ -1033,20 +893,20 @@ This class allows for linking an author to a publication while indicating inform Use subclasses of core:Facility subclasses instead of this class if possible + + + + + A gathering of people for a defined purpose, not necessarily public or announced - + + - - - - - - @@ -1055,11 +915,6 @@ This class allows for linking an author to a publication while indicating inform Regularly updated online journal or newsletter by one or more writers, called bloggers, containing articles and commentary of interest to the blogger - - - 1 - - @@ -1079,11 +934,6 @@ This class allows for linking an author to a publication while indicating inform Public Description from source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers the bibo:presents and the bibo:presentedAt unstable terms. It also indicates that bibo:presents is a sub-property of event:product. - - - 1 - - 2010-06-24 @@ -1098,6 +948,11 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/es/ + + + 1 + + @@ -1115,10 +970,10 @@ This class allows for linking an author to a publication while indicating inform Either city or town - a thickly populated area having fixed boundaries and certain local powers of government. - + + - 1 - + @@ -1130,20 +985,20 @@ This class allows for linking an author to a publication while indicating inform That is a position held by an academic faculty member who works for administration. - + - + Associate Dean An academic administrative position (associate dean, etc.) as distinct from a professional administrative position (non-academic) - server; Bruker Vector-33 FT-IR + A network server is one example. Medical schools and research laboratories can list professional equipment, such as microscopes. - + A physical object provided for specific purpose, task or occupation. - + @@ -1155,25 +1010,25 @@ This class allows for linking an author to a publication while indicating inform + http://purl.org/ontology/bibo/ A specific journal article - + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a periodical or book + Short Definition modified from the bibo ontology. - A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine. stable - - Director of Admissions and Placement; Associate University Librarian Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. + - An employment activity, whether compensated or not. Short definition comes from http://en.wikipedia.org/wiki/Position, and has been modified. + @@ -1185,16 +1040,6 @@ This class allows for linking an author to a publication while indicating inform - - - 1 - - - - - - - The thesis degree. @@ -1205,12 +1050,22 @@ This class allows for linking an author to a publication while indicating inform The source of the public description and this info is found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html. Bibo considers this term "unstable". The bibo editorial note is: "We are not defining, using an enumeration, the range of the bibo:degree to the defined list of bibo:ThesisDegree. We won't do it because we want people to be able to define new degress if needed by some special usecases. Creating such an enumeration would restrict this to happen." + + + + + + - An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials + + + + + @@ -1223,15 +1078,15 @@ This class allows for linking an author to a publication while indicating inform - - - - - + + + + + Relates a document to an event; for example, a paper to a conference. @@ -1255,11 +1110,6 @@ This class allows for linking an author to a publication while indicating inform 2009-04-30 http://faostat.fao.org/DesktopDefault.aspx?PageID=377&lang=es#ancor - - - - - Public Definition source (http://www.answers.com/topic/publisher). @@ -1271,11 +1121,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - @@ -1288,10 +1133,15 @@ This class allows for linking an author to a publication while indicating inform - + 1 - + + + + + 1 + @@ -1304,14 +1154,29 @@ This class allows for linking an author to a publication while indicating inform http://faostat.fao.org/DesktopDefault.aspx?PageID=550&lang=es#ancor 2009-09-21 + + + + + + + + + + US Patent Data; US Job Data A named collection of data, usually containing only one type of data + + + + + - + Computer program and its related documentation; directs the operation of a computer @@ -1349,6 +1214,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + http://www.fao.org/termportal/contr/es/ @@ -1363,6 +1233,16 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 http://www.fao.org/termportal/contr/en/ + + + 1 + + + + + 1 + + My extension program consists of developing and reporting disease management strategies that are both economically and environmentally sound for fresh market vegetable production. We hope that some of this testing will result in practices adaptable for organic production. @@ -1395,11 +1275,26 @@ This class allows for linking an author to a publication while indicating inform An activity of an individual within his or her profession or institution; use outreach provider role for community service or other activities outside the profession. + + + 1 + + Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. + + + 1 + + + + + + + @@ -1418,17 +1313,37 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 FAO terminology + + + 1 + + + + + + + + + + + + + stable + A scholarly academic article, typically published in a journal. - http://purl.org/ontology/bibo/ Written by scholars for other scholars, typically published in an academic journal with an abstract and bibliography - A specific academic journal article + + + 1 + + @@ -1440,6 +1355,16 @@ This class allows for linking an author to a publication while indicating inform + + + + + + + + 1 + + stable @@ -1454,6 +1379,11 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ + + + + + http://www.un.org/Depts/Cartographic/english/htmain.htm http://www.un.org/Depts/Cartographic/english/htmain.htm @@ -1465,17 +1395,42 @@ This class allows for linking an author to a publication while indicating inform http://www.un.org/Depts/Cartographic/french/htmain.htm UN Cartographic Section + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - http://purl.org/dc/terms/ http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html @@ -1484,6 +1439,16 @@ This class allows for linking an author to a publication while indicating inform A summary of the resource. stable + + + + + + + + + + Role of a person designated by a grantee to direct a project or activity being supported by a grant, and who is accountable to the grantee for the proper conduct of the project or activity. Also known as Program Director or Project Director. @@ -1509,11 +1474,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/en/ - - - 1 - - http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -1554,8 +1514,8 @@ This class allows for linking an author to a publication while indicating inform Definition taken from: http://en.wikipedia.org/wiki/University University of Florida; Washington University in St. Louis - An institution of higher education and research, which grants academic degrees in a variety of subjects, and provides both undergraduate education and postgraduate education. + @@ -1563,54 +1523,79 @@ This class allows for linking an author to a publication while indicating inform Definition from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html + + + + + + + + + + + + + + + + + + + + + + + + + Top level of all location classes. It's anticipated that the subclasses will be used when classifying items. And, all locations can be viewable via this class. Use subclasses of core:Location when classsifying items. - + - - + + + + + + + A document created as a basis for discussion or a very early draft of a formal paper - - - - - - 1 - + + - - - - - + + + Used for a single narrative summary of teaching, typically covering a wide range of courses including for credit and non-credit teaching over multiple semesters; the "teaches" property links a person directly with an instance of a Semester Class, typically from an institutional database of record; then use Teacher Role for information about a person's role in non-credit teaching or their specific contribution to individual courses + + + - - - Used for a single narrative summary of teaching, typically covering a wide range of courses including for credit and non-credit teaching over multiple semesters; the "teaches" property links a person directly with an instance of a Semester Class, typically from an institutional database of record; then use Teacher Role for information about a person's role in non-credit teaching or their specific contribution to individual courses - - + + + + source: http://en.wikipedia.org/wiki/Issn @@ -1620,6 +1605,11 @@ This class allows for linking an author to a publication while indicating inform International Standard Serial Number + + + + + @@ -1627,6 +1617,21 @@ This class allows for linking an author to a publication while indicating inform source of definition: http://www.uspto.gov/main/glossary/#p . The following site has patent number formats: http://www.uspto.gov/patents/ebc/kindcodesum.jsp . + + + + + + + + + + + + + + + @@ -1635,6 +1640,7 @@ This class allows for linking an author to a publication while indicating inform + http://purl.org/ontology/bibo/ @@ -1643,7 +1649,6 @@ This class allows for linking an author to a publication while indicating inform A periodical of scholarly journal Articles. Contains original scholarly research or review articles by experts in the field Journal of Information Science; IEEE Intelligent System; Scientometrics - http://purl.org/ontology/bibo/ @@ -1654,10 +1659,20 @@ This class allows for linking an author to a publication while indicating inform Contains news articles, opinions, features, advertising, and is usually issued daily or weekly - + + - 1 - + + + + + + + + + + + @@ -1681,20 +1696,20 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - - - + + + + - - + + + + + + + + @@ -1708,15 +1723,15 @@ This class allows for linking an author to a publication while indicating inform - - - + + + - Wiley Prize in Biomedical Sciences + An Award or Honor An Award or Honor @@ -1733,10 +1748,25 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + + + + + + + + + + + + + + + + @@ -1753,20 +1783,20 @@ This class allows for linking an author to a publication while indicating inform An agent that receives a communication document. - - - - - - - - + + + + + Only use if no specific subclasses of core:EventSeries desribe the activity. - - - A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. + + + + Two or more events that follow on one after the other or are connected one after the other. + + @@ -1776,20 +1806,20 @@ This class allows for linking an author to a publication while indicating inform - - - + + 1 + - + - - + + @@ -1810,15 +1840,10 @@ This class allows for linking an author to a publication while indicating inform use one freetextKeyword assertion for each keyword or phrase. - + + + - - - - - - - @@ -1826,16 +1851,6 @@ use one freetextKeyword assertion for each keyword or phrase. We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - - - 1 - - - - - - - @@ -1847,29 +1862,19 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - - - - + Represents educational training that has been received. This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree. + Currently any abstract name is given to individuals of this class. This could change in the future. - - + A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue + - @@ -1877,21 +1882,21 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + http://purl.org/ontology/bibo/ - Facebook; VIVOweb.org; Flickr A group of Webpages accessible on the Web. A group of webpages available within a specific parent address or URL on the World Wide Web + unstable - - - - - FAO terminology @@ -1909,9 +1914,9 @@ We would like the range of core:outcome to be the union of Event and Process; an Work consisting of collections of previously published works + Short Definition is the Medical Subject Heading (MeSH) definition A document that simultaneously contains other documents. - http://purl.org/ontology/bibo/ stable @@ -1925,11 +1930,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + An area of corporate activity organized as an administrative or functional unit. Definition modified from http://www.thefreedictionary.com/division. It is difficult to tell the difference between a division and a department. Cardiovascular Medicine (division within medicine) - The Ornithological Newsletter @@ -1937,15 +1942,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - 1 - - - - - - + + @@ -1953,16 +1953,11 @@ We would like the range of core:outcome to be the union of Event and Process; an The bibo:reviewOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . As of 26 May 2010, bibo:reviewOf is used with the class Review, but core:reviewIn doesn't seem to be being used. - - 1 - - - VIVO Outreach Team; VIVO Ontology Team - An informal organization brought together for the purposes of a project or event. + @@ -1971,16 +1966,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - 1 - - @@ -2008,10 +1993,10 @@ We would like the range of core:outcome to be the union of Event and Process; an The academic degree of a Thesis + Alchohol Education Center; Center for Arts and Public Policy; Hearing Research Center - A place where a particular activity or service is concentrated. Short Definition take from http://www.thefreedictionary.com/center. @@ -2026,15 +2011,25 @@ We would like the range of core:outcome to be the union of Event and Process; an http://faostat.fao.org/site/377/default.aspx FAOSTAT http://faostat.fao.org/site/377/default.aspx - + 1 - + Indicates the precision of the value of a DateTimeValue instance. + + + + + + + + + + For example an HR job title for a person might be - Assistant University Librarian, and the preferred job title for that same person could be - Physical Sciences Librarian. @@ -2044,13 +2039,13 @@ We would like the range of core:outcome to be the union of Event and Process; an + Short Definition from OCLC Input Standards, EntW A document created to summarize research findings associated with the completion of an academic degree. - stable http://purl.org/ontology/bibo/ Works created to satisfy the requirements for an academic certification or degree; also called dissertation - + @@ -2060,22 +2055,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - 1 - - UN Statistics Division @@ -2089,17 +2074,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - Only use if no specific subclasses of core:Role describe the role. - + + A person's or organization's type of contribution to an endeavor - Only use this broad role class if no subclasses of role describe the item being classified. @@ -2107,16 +2087,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - 1 - - @@ -2130,6 +2100,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + @@ -2142,11 +2117,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ unstable - - - 1 - - @@ -2154,10 +2124,10 @@ We would like the range of core:outcome to be the union of Event and Process; an UN Cartographic Section + A structured file of information or a set of logically related data stored and retrieved using computer-based means Short Definition is the Medical Subject Heading (MeSH) definition - PubMed @@ -2167,8 +2137,17 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + + + + + + - stable http://purl.org/ontology/bibo/ A meeting for consultation or discussion. @@ -2177,11 +2156,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A meeting for consultation or discussion. - - - - 1 - + @@ -2191,40 +2166,30 @@ We would like the range of core:outcome to be the union of Event and Process; an + A distinct, usually ongoing and specialized unit within a large organization. Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division. - Legal (department within a company); Use for any non-academic department - + - - - - - - - - - - - - + + An online article or commentary appearing on a blog - + A specific blog posting Collection of documents or information resources that have a unified identity - stable + Collection of documents or information resources that have a unified identity. Archives, museums and libraries often acquire collections on specific subjects and from distinguished authors or researchers. Also includes collections of resources bundled into a license. http://purl.org/ontology/bibo/ Hill Ornithology Collection; Wiley Interscience Online Books Biochemisty Collection @@ -2247,11 +2212,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition obtained here: http://answers.ask.com/Business/Finance/what_is_a_private_company. Examples of private companies found here: http://www.forbes.com/2008/11/03/largest-private-companies-biz-privates08-cx_sr_1103private_land.html - - - - - @@ -2260,10 +2220,10 @@ We would like the range of core:outcome to be the union of Event and Process; an B.A. Bachelor of Arts - This list may have multiple abbreviations for some degrees. An academic degree at any level, both as reported by individuals for employment and as offered by academic degree programs. - + + @@ -2281,6 +2241,11 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal document proposing or enacting a law or a group of laws. + + + 1 + + Minnesota; Michigan; Indiana; New York; Quebec; Manitoba; Ontario Source of the Short Definition: http://www.thefreedictionary.com/state. @@ -2311,14 +2276,19 @@ We would like the range of core:outcome to be the union of Event and Process; an + - phonograph record; tape; CD; DVD; DAT An audio document; aka record. http://purl.org/ontology/bibo/ stable Recorded audio in any format + + + + + http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49chgef.htm @@ -2332,11 +2302,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - A document containing an authoritative determination (as a decree or judgment) made after consideration of facts or law. @@ -2345,16 +2310,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ - - - 1 - - - - - - - FAO terminology @@ -2373,8 +2328,8 @@ We would like the range of core:outcome to be the union of Event and Process; an film; video; Blu-ray Audiovisual recording in any format + - stable An audio-visual document; film, video, and so forth. @@ -2393,6 +2348,11 @@ We would like the range of core:outcome to be the union of Event and Process; an A location having coordinates in geographic space. + + + 1 + + Text of a speech written in preparation for delivery of the speech. @@ -2422,6 +2382,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + UN cartographic maps (http://www.un.org/Depts/Cartographic/map/profile/world.pdf) @@ -2441,11 +2406,6 @@ We would like the range of core:outcome to be the union of Event and Process; an stable - - - 1 - - @@ -2454,17 +2414,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - A defined class of organizations that fund Grants. + National Institute of Health (NIH) - - - - - @@ -2473,29 +2428,24 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition found here: http://dictionary.reference.com/browse/publisher A person or company whose business is the publishing of books, periodicals, engravings, computer software, etc. - Elsevier; Harper & Row; Indiana University Press - - - - - - - - - - - - - - - + + + + + + + + + 1 + + A student organization is an organization, operated by students at a university, whose membership normally consists only of students. Dancin' Gators @@ -2516,15 +2466,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - - - - - - + + @@ -2539,16 +2484,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/fr/ - - - - - - - - - - @@ -2558,16 +2493,11 @@ We would like the range of core:outcome to be the union of Event and Process; an The full URL. + Uniform Resource Locator (URL) specifies where an identified resource is available and the mechanism for retrieving it. - http://info.slis.indiana.edu/~katy/ - - - 1 - - @@ -2586,11 +2516,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - @@ -2599,10 +2524,10 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable - + - - + 1 + http://www.fao.org/termportal/contr/ar/ @@ -2624,6 +2549,16 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + + + + + + Short Definition copied from bibo ontology @@ -2639,31 +2574,51 @@ We would like the range of core:outcome to be the union of Event and Process; an Public Definition source (http://www.answers.com/topic/publisher). + + + + + An Institute normally has a research focus but may also fulfill instructional or outreach roles. Institute for Fundamental Theory + + + 1 + + - - This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. - Only use if no specific subclasses of foaf:organization desribe the organization. - + A generic class encompassing several types of organizations. - - + + + + + - + Ued to describe an organization related to bibliographic items such as a publishing company, etc. - + + + + + + + + + + + + + - - http://www.fao.org/termportal/contr/fr/ @@ -2697,11 +2652,31 @@ We would like the range of core:outcome to be the union of Event and Process; an definition modified from: source (http://en.wikipedia.org/wiki/Seating_capacity). 55 + + + + + + + + + + + + + + + The digital file (or physical equivalent), if available after the conference, vs. the act of attending/presenting: use ConferencePresentation for information about date/time/location/name of the event where the poster was presented + + + 1 + + An organized series of workshop events, whether repetitions of the same workshop or multiple different workshops. Use workshop for individual events. @@ -2713,17 +2688,27 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + + + + + + + + 1 + + + - - - - - @@ -2731,23 +2716,23 @@ We would like the range of core:outcome to be the union of Event and Process; an + + Only use if no specific subclasses of event:Event are appropriate. + + + This class will also display instances of subclasses under Event, e.g. Philosophy Department Discussion Club; 2009 Racker Lecture; screening of a documentary. In addition to a location in space and time, an event may have any or all the following qualities: actively participating agents, passive factors, work products. Also, it may be in a virtual space or part of a series such as a lecture series. The previous short definition was: "An arbitrary classification of a space/time region, by a cognitive agent." + + + + - - - - Something that happens at a given place and time. - - - - - - - + + @@ -2757,6 +2742,11 @@ The previous short definition was: "An arbitrary classification of a space/time http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet + + + + + http://www.fao.org/termportal/en/ @@ -2776,6 +2766,11 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + @@ -2806,17 +2801,22 @@ The previous short definition was: "An arbitrary classification of a space/time - + - - + + + + + + + - - + An award, honor, or distinction received by a person on a particular date (not the award itself as given repeatedly, and not a grant award). - + + A specific award on a particular date or for a particular date range. Ninth annual Wiley Prize in Biomedical Sciences, for the discovery of a light activated ion channel @@ -2836,11 +2836,6 @@ The previous short definition was: "An arbitrary classification of a space/time Draft legislation presented for discussion to a legal body. stable - - - - - @@ -2853,13 +2848,28 @@ The previous short definition was: "An arbitrary classification of a space/time Role of co-principal investigator of a grant, who devotes a specified percentage of time and is considered key personnel. + + + + + + + + + + + + + + + Professor, associate professor and assistant professor are common positions for academic faculty. - Professor; Associate Professor; Assistant Professor Academic position in a university or institution - + + @@ -2874,12 +2884,17 @@ The previous short definition was: "An arbitrary classification of a space/time The dual relationship of a professor advising a student and the student being advised by a professor, typically including start and end dates - + - + + + + + + 1 - + @@ -2891,16 +2906,6 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - - - - - - @@ -2922,11 +2927,6 @@ modern society using the world of Star trek. Los Angeles Times, March An section number - - - - - @@ -2950,6 +2950,11 @@ modern society using the world of Star trek. Los Angeles Times, March This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. + + + + + http://purl.org/ontology/bibo/ @@ -2958,10 +2963,15 @@ modern society using the world of Star trek. Los Angeles Times, March An agent that interview another agent. - + - - + 1 + + + + + + @@ -2970,15 +2980,10 @@ modern society using the world of Star trek. Los Angeles Times, March - - + - - - - - - + 1 + @@ -2992,15 +2997,15 @@ modern society using the world of Star trek. Los Angeles Times, March a specific period or duration, defined by (optional) start and end date/times. - + - 1 - + + - + + + - - @@ -3018,10 +3023,15 @@ modern society using the world of Star trek. Los Angeles Times, March Short Definition from bibo ontology - + + + + + + 1 - + @@ -3033,11 +3043,6 @@ modern society using the world of Star trek. Los Angeles Times, March - - - - - FAO terminology FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -3057,11 +3062,6 @@ modern society using the world of Star trek. Los Angeles Times, March - - - - - @@ -3074,11 +3074,6 @@ modern society using the world of Star trek. Los Angeles Times, March - - - 1 - - @@ -3099,8 +3094,23 @@ Examples of a Publisher include a person, an organization, or a service. Typical - - + 1 + + + + + + + + + + + + + + + + FAO terminology @@ -3140,6 +3150,11 @@ Examples of a Publisher include a person, an organization, or a service. Typical A presentation of a series of slides, usually presented in front of an audience with written text and images. stable + + + 1 + + @@ -3172,11 +3187,6 @@ Examples of a Publisher include a person, an organization, or a service. Typical http://purl.org/ontology/bibo/ - - - - - http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -3190,35 +3200,35 @@ Examples of a Publisher include a person, an organization, or a service. Typical 2010-06-24 - - - 1 - - Resource dependent on other entities This class is here so it can be equivalent to vitro:DependentResource. Deletion in the VIVO system behaves differently when deleting members of this class: related individuals may need to be deleted as well. - - - - - - - - - - A distinct, usually specialized educational unit within an educational organization. - - + + Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts) + + + 1 + + + + + + + + + + + + @@ -3226,11 +3236,6 @@ Examples of a Publisher include a person, an organization, or a service. Typical RearcherID is a Thomson Reuters project where researchers have a place to manage and share their professional information. It will allow them to solve author identity issues while simultaneously adding dynamic citation metrics and collaboration networks to your personal profile. Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3249,11 +3254,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/A passage selected from a larger work. http://purl.org/ontology/bibo/ - - - - - @@ -3263,28 +3263,33 @@ Definition source: http://isiwebofknowledge.com/researcherid/Critical or explanatory note for a Document. + + + + + + + + 1 + + - + + An intramural or extramural award to support scholarly work, such as UF09179 (VIVO) Short definition is from the Glossary of NIH Terms. - + + Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity - - - + Written musical composition for voice or instruments or both - - - 1 - - 2010-06-24 http://www.fao.org/termportal/contr/ar/ @@ -3298,11 +3303,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - - - @@ -3318,10 +3318,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Information Science; Computer Science; Anthropology - + + - - + This namespace - http://purl.org/dc/elements/1.1/ - does not appear to have this element. @@ -3338,11 +3338,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - http://www.fao.org/termportal/contr/es/ http://www.fao.org/termportal/contr/fr/ @@ -3365,26 +3360,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/http://purl.org/ontology/bibo/ source for public description: http://en.wikipedia.org/wiki/Universal_Product_Code. - - - - - A person with at least one academic appointment to a specific faculty of a university or institution of higher learning. Definition from here: http://research.carleton.ca/htr/defs.php. - - + - - - - - - + + @@ -3393,36 +3378,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/Intel Talent Search; poetry contest Not the same as an award or distinction. - + + + - 1 - - + - - - - - - - - - - - - - - - - - - 1 - - @@ -3450,11 +3415,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3464,6 +3424,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ 0.7 + + + + + http://purl.org/ontology/bibo/ New Yorker @@ -3477,17 +3442,22 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Address has properties for department name, street, city, state or province, postal code, and country. For US specific address, classify using core:US Postal Code. core:Address will display all addresses. - University of Waterloo, 200 University Avenue West, Waterloo, Ontario, Canada N2L 3G1 + A code and abstract concept expressing a location on the Earth's surface. To classify US specific addresses, use core:US Postal Code. + + + + + + Librarian; Library Systems Analyst; Music Bibliographer - - It is the common position in libraries. A position held by library and information science professionals, or academic or technical experts, in support of providing information services or materials + @@ -3503,41 +3473,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/es/ - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - @@ -3553,15 +3493,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/Library of Congress Control Number Source: http://en.wikipedia.org/wiki/Library_of_Congress_Control_Number. - + + + - 1 - - + + + - - @@ -3570,26 +3510,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - - - - 1 - - - - - - - - - - - - A group can also be an organization but need not be; typically used for looser associations of people or organizations acting together in some fashion, not necessarily through formal agreement or on a long-term basis. Added to the VIVO ontology to be able to support informal and perhaps even private groups of people around an idea, funding opportunity, or event. @@ -3604,24 +3524,24 @@ Definition source: http://isiwebofknowledge.com/researcherid/A chapter of a book. A main division of a book - + 1 - + + + + + + Curriculum Steering Committee; PhD Advisory Committee - A group of people organized for a specific purpose (e.g., a reporting or advisory role), often with a charge and for a specific duration. + There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important. - - - - - Short Definition from OCLC Input Standards, EntW http://purl.org/ontology/bibo/ @@ -3650,28 +3570,18 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - 1 - - + 1320 East 10th Street, Wells Library 021 Bloomington, IN 47405 Formal address in US postal address system. - + - - + US postal address follow the format street, apt or office number (optional), city, state, and zipcode. @@ -3685,6 +3595,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + + + + 1 + + @@ -3698,21 +3618,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print. - - - 1 - - - + + + + Short Definition from the bibo ontology - unstable A section of a book - - http://purl.org/ontology/bibo/ A section of a book. @@ -3727,11 +3642,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - A court associated with a legal document; for example, that which issues a decision. @@ -3755,11 +3665,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable - - - 1 - - @@ -3774,6 +3679,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/The Getty Museum A building or place where works of art, scientific specimens, or other objects of permanent value are kept and displayed. + + + 1 + + unstable http://purl.org/ontology/bibo/ @@ -3782,6 +3692,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3801,37 +3716,12 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/fr/ - - - - - - - - - - - - - 1 - - - - - - - - - - 1 - - @@ -3842,6 +3732,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3854,6 +3749,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + + + + + + @@ -3884,16 +3789,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/Not sure how to access the "Editor's Comments". But as North America is a continent, it would be placed directly into the continent subclass and viewable through this class along with any other subclass entities. Any region that goes beyond national boundaries and does not fit into any subclass of core:TransnationalRegion. - - - - - - - - - - @@ -3901,22 +3796,12 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - - - - - - A short form for an longer title or name. @@ -3928,6 +3813,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A person holding a position that is not considered to be an academic appointment. + + + + + @@ -3935,16 +3825,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - + + + 1 + + For example, National Science Foundation providesFundingThrough Graduate Research Fellowship Program; National Institutes of Health providesFundingThrough National Center for Research Resources. @@ -3952,11 +3842,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - A location having coordinates in geographic space. @@ -3964,6 +3849,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Use subclasses of core:Geographic Location subclasses instead of this class if possible. + + + + + + + + + + @@ -3983,17 +3878,22 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + + + 1 + + - - - 1 - - An agent that is interviewed by another agent. stable @@ -4022,11 +3922,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Bacteria-resistant bandage; Termite prevention system; Hurricane resistant houses - - - - - Relates a document to some transcribed original. The bibo:transcriptOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers this term unstable. @@ -4036,11 +3931,21 @@ Definition source: http://isiwebofknowledge.com/researcherid/unstable + + + + + + + + 1 + + @@ -4050,6 +3955,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/Publication Description source http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . This term is also considered unstable. unstable + + + + + @@ -4060,6 +3970,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support + + + @@ -4090,6 +4009,16 @@ bibo has the domain of this property set to the union of Collection and Document + + + 1 + + + + + + + FAO terminology @@ -4128,14 +4057,29 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + + + + + + + + + + + - - - + + 1 + @@ -4153,10 +4097,10 @@ bibo has the domain of this property set to the union of Collection and Document - + - 1 - + + @@ -4221,18 +4165,18 @@ bibo has the domain of this property set to the union of Collection and Document - A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate - - - + + - Short Definition from the bibo ontology + stable - http://purl.org/ontology/bibo/ + + A document (noun) is a bounded physical representation of body of information designed with the capacity (and usually intent) to communicate. A document may manifest symbolic, diagrammatic or sensory-representational information. + A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate @@ -4264,6 +4208,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + Short Definition from the bibo ontology @@ -4278,6 +4227,16 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + + + + + + FAO terminology http://www.fao.org/termportal/contr/ar/ @@ -4305,28 +4264,28 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - - + 1 + - + An edited book. + http://purl.org/ontology/bibo/ + - - Best American Science Writing 2009 stable An edited collection of stand-alone articles published as a book - + - + - 1 - + + Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible. @@ -4352,45 +4311,45 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + - - - - + + + + - - - - - - + + - - - - - - - - - - - - + + - + + + + + + + + + + + + + - - - - - + + + - + - 1 - + 1 + @@ -4398,6 +4357,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Medicine + + + + + + + + 1 + + http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/ar/ @@ -4423,10 +4392,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - - + 1 + @@ -4446,18 +4415,28 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi College of Arts & Sciences; Ivy Tech Community College A primary academic unit within a University or a free-standing higher education organization without graduate degree programs. - - - - - - + Document1 isVersionOf Document2 This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. + + + + + + + + 1 + + + + + + + @@ -4482,16 +4461,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - - - - 1 - - @@ -4521,36 +4490,41 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + + + + + + 1 + + + + + + + - + - + - - + + - - - - - - - - 1 - - @@ -4558,10 +4532,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - UITS service UITS service is the information technology services provided by Indiana University. SC. + + A regularly offered service in support of an academic, research, or administrative function (not personal or professional service by an individual) @@ -4571,19 +4545,29 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + 1 + + + + + 1 + + + + + + + - - - - - Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. @@ -4596,17 +4580,17 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi The grounds of a school, college, university, or hospital. Or, a large, usually suburban, landscaped business or industrial site. + + + + + - - - - - unstable @@ -4621,10 +4605,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - + - + 1 + @@ -4632,10 +4616,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi This is done with a restriction on agent. - + - - + + Code of Federal Regulations @@ -4647,26 +4631,12 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi A work consisting of texts of rules and regulations related to statutes issued by executive or administrative agencies A collection of statutes. - - - - An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support - - - - - - - - 1 - - Used information from this definition: http://dictionary.reference.com/browse/library. + A collection of any materials, for study and enjoyment, which has been systematically arranged. - Marston Science Library @@ -4683,20 +4653,30 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ - - + - + 1 + - + - - + + - + + + + + + - + + + + + 1 + http://www.fao.org/termportal/contr/ar/ @@ -4711,6 +4691,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + 1 + + @@ -4729,11 +4714,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - - - 1 - - @@ -4745,10 +4725,20 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi full email address - + - - + 1 + + + + + + + + + + 1 + @@ -4756,14 +4746,24 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. + + + + + Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. - - - + + + - + + + + + + @@ -4771,16 +4771,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Chicago; New York; Bloomington; Gainesville - - - 1 - - - - - - 2 - @@ -4788,25 +4778,20 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - - - - - - For data ingest from authoritative sources to record the actual way a person was listed as author, as potentially valuable information for author disambiguation. - - + + + + + + + @@ -4830,19 +4815,24 @@ We would like the range of core:outcome to be the union of Event and Process; an http://aims.fao.org/website/Search-AGROVOC/sub http://aims.fao.org/website/Search-AGROVOC/sub + + + 1 + + Used to link a bibliographic item to one of its contributor: can be an author, an editor, a publisher, etc. - + - - + 1 + - + - - + + @@ -4850,11 +4840,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - @@ -4871,16 +4856,21 @@ We would like the range of core:outcome to be the union of Event and Process; an Any organization (likely also asserted as another class of Organization) with a primary, ongoing research function, not just through occasional roles - + - - + + The result of rendering a work from one language to another + + + + + @@ -4899,11 +4889,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - http://www.fao.org/figis/servlet/RefServlet http://www.fao.org/figis/servlet/RefServlet @@ -4916,12 +4901,17 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + Medical Subject Heading (MeSH) definition of Technical Report: Work consisting of a formal report giving details of the investigation and results of a medical or other scientific problem. When issued by a government agency or comparable official body, its contents may be classified, unclassified, or declassified with regard to security clearance. This publication type may also cover a scientific paper or article that records the current state or current position of scientific research and development. If so labeled by the editor or publisher, this publication type may be properly used for journal articles. - A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc.. http://purl.org/ontology/bibo/ + A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc. stable @@ -4944,16 +4934,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/es/ FAO terminology - - - - - - - - - - 2010-06-24 http://www.fao.org/termportal/en/ @@ -4967,30 +4947,35 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/fr/ + + + + + + + + + + - - - + + + - - - - + + + + - - - - - @@ -5001,15 +4986,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - 1 - + 1 + - - + + @@ -5022,17 +5007,17 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + For individual, separate conferences, use conference instead. core:ConferenceSeries and core:SeminarSeries are very similar. An organized series of a meeting for consultation or discussion. - - - - - @@ -5047,22 +5032,17 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ Short Definition from the bibo ontology - - - + - - - - - + + + A position involving academic work but without faculty status - Researcher; Academic Extension Associate; Postdoctoral Associate - + Those positions are held by people who do academic work but do not have faculty positions in universities or institutes. @@ -5090,14 +5070,19 @@ We would like the range of core:outcome to be the union of Event and Process; an An outreach or community service role directed outside a person's primary profession and institution Communicating Astronomy to the Public + + + + + stable - - A loose, thematic, collection of Documents, often Books. A thematic collection of documents, usually books, issued at regular or irregular intervals http://purl.org/ontology/bibo/ + + Methods in Molecular Biology @@ -5123,16 +5108,6 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal decision on appeal that takes action on a case (affirming it, reversing it, etc.). - - - - - - - - 1 - - CODEN became particularly common in the scientific community as a citation system for periodicals cited in technical- as well in chemistry-related publications and as a search tool in many bibliographic catalogues. @@ -5153,15 +5128,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - 1 - + 1 + - + - - + + @@ -5177,18 +5152,13 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - + Short Definition modified from the one found here: http://www.thefreedictionary.com/county. Alachua; Baker; Bradford; Kenora; Ottawa; Waterloo The largest administrative division of most states or provinces. - - - - - Home page for Scopus: http://www.scopus.com/home.url @@ -5212,40 +5182,40 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - - + 1 + - - + Short Definition from the bibo ontology + A distinct part of a larger document or collected document http://purl.org/ontology/bibo/ a distinct part of a larger document or collected document. - unstable + - + - + + Short Definition copied from bibo ontology - - + + http://purl.org/ontology/bibo/ - A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers. A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers - + stable @@ -5260,25 +5230,30 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A laboratory that exists primarily to conduct research vs. to provide services - - - - - + + + + + - - - + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. - + + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. + + + + + 1 + @@ -5286,6 +5261,16 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + 1 + + + + + 1 + + @@ -5297,11 +5282,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A URLLink that is designated (by the user or anyone else) as a primary link for the person, organization, event, etc. - - - - - @@ -5312,11 +5292,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Special Libraries Association; Association for Computing Machinery(ACM); American Medical Informatics Association(AMIA) - - - - - @@ -5325,11 +5300,21 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Note: Bibo:editor is used as the inverse of core:editorOf. Public Description for bibo:editor was obtained from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . + + + + + A postdoctoral training appointment (job) + + + + + @@ -5352,6 +5337,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + @@ -5376,6 +5366,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + @@ -5383,11 +5378,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - @@ -5396,6 +5386,16 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + + + + + + The name defining a special edition of a document. Normally its a literal value composed of a version number and words. @@ -5403,11 +5403,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://purl.org/ontology/bibo/ - - - 1 - - FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/zh/ @@ -5421,10 +5416,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/termportal/en/ 2010-06-24 - + + + 1 + + + + + - - @@ -5445,15 +5445,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49alpha.htm - + + - - + - 1 - + + @@ -5462,12 +5462,12 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + A list of items in a collection; an ordered compilation of item descriptions and sufficient information to afford access to them - NLM Catalog Short Definition is the Medical Subject Heading (MeSH) definition - + From 0be9ace23744b13ffa80f20e8b711a15a43593f1 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Wed, 9 Feb 2011 14:56:56 +0000 Subject: [PATCH 382/427] Holly did some more finalization of the test cases. --- .../suites/AddRoles/DeleteIndexStuff.html | 75 +++++++++++++++++ .../suites/AddRolesVB/DeleteIndexStuff.html | 82 ++++++++++++++++++- .../CheckVisualizations/DeleteIndexStuff.html | 60 ++++++++++++++ .../TestTemporalGraphs.html | 15 ++-- .../AddCoInvestigators.html | 2 +- .../DeleteIndexStuff.html | 60 ++++++++++++++ .../TestTemporalGraphs.html | 7 +- .../DeleteEducationalBackground.html | 5 ++ 8 files changed, 298 insertions(+), 8 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html index 22adc5ba..905de58f 100644 --- a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html @@ -1579,6 +1579,81 @@ 10000 + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + verifyTextNotPresent courses diff --git a/utilities/acceptance-tests/suites/AddRolesVB/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddRolesVB/DeleteIndexStuff.html index 87862a81..f6d3b517 100644 --- a/utilities/acceptance-tests/suites/AddRolesVB/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddRolesVB/DeleteIndexStuff.html @@ -1111,7 +1111,7 @@ assertTitle - Index to VIVO Contents + Index of Contents @@ -1239,6 +1239,11 @@ VIVO Site Administration + + clickAndWait + link=Index + + clickAndWait link=Organization @@ -1579,6 +1584,81 @@ 10000 + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + + + refreshAndWait + 10000 + + verifyTextNotPresent courses diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html index 2fb5c097..affab78a 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html @@ -909,6 +909,66 @@ VIVO Site Administration + + clickAndWait + link=Index + + + + clickAndWait + link=Journal + + + + assertTitle + Journal + + + + clickAndWait + link=Childhood Today + + + + assertTitle + Childhood Today + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + pause + 5000 + + + + assertTitle + VIVO Site Administration + + comment Verify that everything is gone diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html index 04b0fe42..02333fd1 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html @@ -729,21 +729,26 @@ link=Zink, Zoe - - pause 5000 - - - comment Make dept sub-org of a college + + pause + 5000 + + clickAndWait link=Site Admin + + pause + 5000 + + assertTitle VIVO Site Administration diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddCoInvestigators.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddCoInvestigators.html index b69b0663..ffe439d9 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddCoInvestigators.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddCoInvestigators.html @@ -326,7 +326,7 @@ pause - 5000 + 10000 diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteIndexStuff.html index 2fb5c097..affab78a 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteIndexStuff.html @@ -909,6 +909,66 @@ VIVO Site Administration + + clickAndWait + link=Index + + + + clickAndWait + link=Journal + + + + assertTitle + Journal + + + + clickAndWait + link=Childhood Today + + + + assertTitle + Childhood Today + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + click + _delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + pause + 5000 + + + + assertTitle + VIVO Site Administration + + comment Verify that everything is gone diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/TestTemporalGraphs.html index 6040f297..2454c3ec 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/TestTemporalGraphs.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/TestTemporalGraphs.html @@ -736,7 +736,7 @@ pause - 5000 + 10000 @@ -749,6 +749,11 @@ link=Site Admin + + pause + 10000 + + assertTitle VIVO Site Administration diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html index fbd2e76d..90afd944 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html @@ -119,6 +119,11 @@ Faculty, Jane + + pause + 5000 + + comment Verify the education to be deleted does indeed exist From f6dd73e8339371211debc211dcaa4ff6a08a48e3 Mon Sep 17 00:00:00 2001 From: sjm222 Date: Wed, 9 Feb 2011 15:06:02 +0000 Subject: [PATCH 383/427] updating for Award, AwardReceipt and the class formerly known as ResearchOpportunity --- .../optional/mapping/vivo-bfo-1.2.owl | 216 ++++++++++++++++++ 1 file changed, 216 insertions(+) create mode 100644 productMods/WEB-INF/ontologies/optional/mapping/vivo-bfo-1.2.owl diff --git a/productMods/WEB-INF/ontologies/optional/mapping/vivo-bfo-1.2.owl b/productMods/WEB-INF/ontologies/optional/mapping/vivo-bfo-1.2.owl new file mode 100644 index 00000000..395a2749 --- /dev/null +++ b/productMods/WEB-INF/ontologies/optional/mapping/vivo-bfo-1.2.owl @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 60f6b7ef16eea003e1059cb290f961cc847a2d70 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Wed, 9 Feb 2011 16:28:19 +0000 Subject: [PATCH 384/427] --- .../CheckVisualizations/AddPublications.html | 5 ++ .../TestTemporalGraphs.html | 4 +- .../AddPublications.html | 5 ++ .../suites/CheckVisualizationsVB/Suite.html | 48 +++++++++---------- 4 files changed, 36 insertions(+), 26 deletions(-) diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html index b71e7e5d..4da9675b 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html @@ -414,6 +414,11 @@ Edit + + select + typeOfNew + label=Journal (bibo) + clickAndWait submit diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html index 02333fd1..0904dd38 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html @@ -736,7 +736,7 @@ pause - 5000 + 10000 @@ -1116,7 +1116,7 @@ pause - 5000 + 10000 diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddPublications.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddPublications.html index d85af2d7..442b880a 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddPublications.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddPublications.html @@ -414,6 +414,11 @@ Edit + + select + typeOfNew + label=Journal (bibo) + clickAndWait submit diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/Suite.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/Suite.html index 3cadf6c0..f88e2d40 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/Suite.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/Suite.html @@ -1,24 +1,24 @@ - - - - - - Test Suite - - - - - - - - - - - - - - - -
Test Suite
SetDefaultTheme
AddTestFaculty
AddPublications
AddCoAuthors
AddGrants
AddCoInvestigators
TestTemporalGraphs
CheckGrantDates
DeleteTestFaculty
DeleteTestCos
DeleteIndexStuff
- - + + + + + + Test Suite + + + + + + + + + + + + + + + +
Test Suite
SetDefaultTheme
AddTestFaculty
AddPublications
AddCoAuthors
AddGrants
AddCoInvestigators
TestTemporalGraphs
CheckGrantDates
DeleteTestFaculty
DeleteTestCos
DeleteIndexStuff
+ + From ac6baffa530c7343d3ac9f4e1929f9a88cbd8b70 Mon Sep 17 00:00:00 2001 From: bkoniden Date: Wed, 9 Feb 2011 17:26:36 +0000 Subject: [PATCH 385/427] Adding timing info for CONSTRUCT vs SELECT on EntityPubCount, EntityGrantCount and CoPIGrantCount. Adding CONSTRUCT queries for PersonGrantCount --- .../CoPIGrantCountConstructQueryRunner.java | 6 + .../CoPIGrantCountQueryRunner.java | 27 ++- ...yPublicationCountConstructQueryRunner.java | 7 + .../EntityPublicationCountQueryRunner.java | 16 +- .../EntityPublicationCountRequestHandler.java | 2 +- ...EntitySubOrganizationTypesQueryRunner.java | 4 +- .../EntityGrantCountConstructQueryRunner.java | 16 +- .../EntityGrantCountQueryRunner.java | 19 +- .../EntityGrantCountRequestHandler.java | 2 +- .../PersonGrantCountConstructQueryRunner.java | 206 ++++++++++++++++++ 10 files changed, 284 insertions(+), 21 deletions(-) create mode 100644 src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountConstructQueryRunner.java diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java index 210dc91e..0b4a6051 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java @@ -31,6 +31,8 @@ public class CoPIGrantCountConstructQueryRunner { private String egoURI; private DataSource dataSource; + + private long before, after; private Log log = LogFactory.getLog(CoPIGrantCountConstructQueryRunner.class.getName()); @@ -181,6 +183,8 @@ public class CoPIGrantCountConstructQueryRunner { Model constructedModel = ModelFactory.createDefaultModel(); + before = System.currentTimeMillis(); + for (String queryString : constructQueries) { log.debug("CONSTRUCT query string : " + queryString); @@ -204,6 +208,8 @@ public class CoPIGrantCountConstructQueryRunner { } } + after = System.currentTimeMillis(); + log.info("Time taken to execute the CONSTRUCT queries is in milliseconds: " + (after - before) ); return constructedModel; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java index f7991250..9a6d1258 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java @@ -12,6 +12,7 @@ import java.util.Set; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import com.hp.hpl.jena.iri.IRI; import com.hp.hpl.jena.iri.IRIFactory; @@ -50,12 +51,14 @@ public class CoPIGrantCountQueryRunner implements QueryRunner { private Model dataSource; - private Log log; + private Log log = LogFactory.getLog(CoPIGrantCountQueryRunner.class.getName()); private UniqueIDGenerator nodeIDGenerator; private UniqueIDGenerator edgeIDGenerator; + private long before, after; + private static final String SPARQL_QUERY_COMMON_OPTIONAL_BLOCK_FOR_ROLE_DATE_TIME = "" + "OPTIONAL {" + " ?Role core:dateTimeInterval ?dateTimeIntervalValue . " @@ -84,7 +87,7 @@ public class CoPIGrantCountQueryRunner implements QueryRunner { this.egoURI = egoURI; this.dataSource = dataSource; - this.log = log; + // this.log = log; this.nodeIDGenerator = new UniqueIDGenerator(); this.edgeIDGenerator = new UniqueIDGenerator(); @@ -315,8 +318,7 @@ public class CoPIGrantCountQueryRunner implements QueryRunner { + "} " + "} "; - log.debug("COPI QUERY - " + sparqlQuery); - + // log.debug("COPI QUERY - " + sparqlQuery); //System.out.println("\n\nCOPI QUERY - " + sparqlQuery + "\n\n"); return sparqlQuery; @@ -351,8 +353,14 @@ public class CoPIGrantCountQueryRunner implements QueryRunner { throw new MalformedQueryParametersException("URI parameter is either null or empty."); } - ResultSet resultSet = executeQuery(generateEgoCoPIquery(this.egoURI), - this.dataSource); + before = System.currentTimeMillis(); + + ResultSet resultSet = executeQuery(generateEgoCoPIquery(this.egoURI), this.dataSource); + + after = System.currentTimeMillis(); + + log.info("Time taken to execute the SELECT queries is in milliseconds: " + (after - before) ); + return createQueryResult(resultSet); } @@ -393,7 +401,9 @@ public class CoPIGrantCountQueryRunner implements QueryRunner { CoPINode egoNode = null; Set edges = new HashSet(); - + + before = System.currentTimeMillis(); + while (resultSet.hasNext()) { QuerySolution solution = resultSet.nextSolution(); @@ -529,6 +539,9 @@ public class CoPIGrantCountQueryRunner implements QueryRunner { edgeUniqueIdentifierToVO); + after = System.currentTimeMillis(); + log.info("Time taken to iterate through the ResultSet of SELECT queries is in milliseconds: " + (after - before) ); + return new CoPIData(egoNode, nodes, edges); } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountConstructQueryRunner.java index a1f3b486..9bce9451 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountConstructQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountConstructQueryRunner.java @@ -33,6 +33,8 @@ public class EntityPublicationCountConstructQueryRunner { private Log log = LogFactory.getLog(EntityPublicationCountConstructQueryRunner.class.getName()); + private long before, after; + public EntityPublicationCountConstructQueryRunner(String egoURI, DataSource dataSource, Log log){ this.egoURI = egoURI; this.dataSource = dataSource; @@ -187,6 +189,8 @@ public class EntityPublicationCountConstructQueryRunner { private Model executeQuery(Set constructQueries, DataSource dataSource) { Model constructedModel = ModelFactory.createDefaultModel(); + + before = System.currentTimeMillis(); for (String queryString : constructQueries) { @@ -212,6 +216,9 @@ public class EntityPublicationCountConstructQueryRunner { } } + + after = System.currentTimeMillis(); + log.info("Time taken to execute the CONSTRUCT queries is in milliseconds: " + (after - before) ); // constructedModel.write(System.out); return constructedModel; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java index 91f7a5b6..95770e7e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java @@ -47,6 +47,7 @@ public class EntityPublicationCountQueryRunner implements QueryRunner { private String entityURI; private Model dataSource; private Log log = LogFactory.getLog(EntityPublicationCountQueryRunner.class.getName()); + private long before, after; private static final String SPARQL_QUERY_COMMON_SELECT_CLAUSE = "" + " (str(?Person) as ?personLit) " @@ -85,6 +86,8 @@ public class EntityPublicationCountQueryRunner implements QueryRunner { Map subentityURLToVO = new HashMap(); Map personURLToVO = new HashMap(); + before = System.currentTimeMillis(); + while (resultSet.hasNext()) { QuerySolution solution = resultSet.nextSolution(); @@ -202,7 +205,10 @@ public class EntityPublicationCountQueryRunner implements QueryRunner { } //TODO: return non-null value - log.info("Returning entity that contains the following set of subentities: "+entity.getSubEntities().toString()); + // log.info("Returning entity that contains the following set of subentities: "+entity.getSubEntities().toString()); + after = System.currentTimeMillis(); + log.info("Time taken to iterate through the ResultSet of SELECT queries is in milliseconds: " + (after - before) ); + return entity; } @@ -284,8 +290,14 @@ public class EntityPublicationCountQueryRunner implements QueryRunner { "URL parameter is either null or empty."); } + before = System.currentTimeMillis(); + ResultSet resultSet = executeQuery(this.entityURI, this.dataSource); - + + after = System.currentTimeMillis(); + + log.info("Time taken to execute the SELECT queries is in milliseconds: " + (after - before) ); + return createJavaValueObjects(resultSet); } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java index b1f68c82..e87e9924 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java @@ -283,7 +283,7 @@ public class EntityPublicationCountRequestHandler implements yearPubCount.add(currentPubYear); } - log.info("entityJson.getLabel() : " + entityJson.getLabel() + " subOrganizationTypesResult " + subOrganizationTypesResult.toString()); + //log.info("entityJson.getLabel() : " + entityJson.getLabel() + " subOrganizationTypesResult " + subOrganizationTypesResult.toString()); entityJson.setYearToActivityCount(yearPubCount); entityJson.getOrganizationType().addAll(subOrganizationTypesResult.get(entityJson.getLabel())); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesQueryRunner.java index bcd1b8a4..9cda75e4 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesQueryRunner.java @@ -99,7 +99,7 @@ public class EntitySubOrganizationTypesQueryRunner implements QueryRunner " + subOrganizationLabelToTypes.size()); // System.out.println("\n\nPeople Label Types Size --> " + personLabelToTypes.size()); - log.info("Sub Organization Label Types Size : " + subEntityLabelToTypes.size()); +// log.info("Sub Organization Label Types Size : " + subEntityLabelToTypes.size()); return subEntityLabelToTypes; //return (subOrganizationLabelToTypes.size() != 0 )? subOrganizationLabelToTypes : personLabelToTypes ; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountConstructQueryRunner.java index ef98530f..543cce6e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountConstructQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountConstructQueryRunner.java @@ -31,6 +31,8 @@ public class EntityGrantCountConstructQueryRunner { private String egoURI; private DataSource dataSource; + + private long before, after; private Log log = LogFactory.getLog(EntityGrantCountConstructQueryRunner.class.getName()); @@ -266,7 +268,9 @@ public class EntityGrantCountConstructQueryRunner { private Model executeQuery(Set constructQueries, DataSource dataSource) { Model constructedModel = ModelFactory.createDefaultModel(); - + + before = System.currentTimeMillis(); + for (String queryString : constructQueries) { log.debug("CONSTRUCT query string : " + queryString); @@ -290,9 +294,13 @@ public class EntityGrantCountConstructQueryRunner { qe.close(); } - } - log.debug("Statements for constructed model of EntityGrantCount : "+ constructedModel.listStatements().toString()); - // constructedModel.write(System.out); + } + + after = System.currentTimeMillis(); + + // log.debug("Statements for constructed model of EntityGrantCount : "+ constructedModel.listStatements().toString()); + log.info("Time taken to execute the CONSTRUCT queries is in milliseconds: " + (after - before) ); + // constructedModel.write(System.out); return constructedModel; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java index 3485f267..9d709a91 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java @@ -47,6 +47,7 @@ public class EntityGrantCountQueryRunner implements QueryRunner { private String entityURI; private Model dataSource; private Log log = LogFactory.getLog(EntityGrantCountQueryRunner.class.getName()); + private long before, after; private static final String SPARQL_QUERY_COMMON_SELECT_CLAUSE = "SELECT " @@ -109,7 +110,9 @@ public class EntityGrantCountQueryRunner implements QueryRunner { Map grantURIToVO = new HashMap(); Map subentityURLToVO = new HashMap(); Map personURLToVO = new HashMap(); - + + before = System.currentTimeMillis(); + while (resultSet.hasNext()) { // log.info("Checking whether EntityGrantCount produced any resultset against the Constructed Model"); QuerySolution solution = resultSet.nextSolution(); @@ -227,7 +230,9 @@ public class EntityGrantCountQueryRunner implements QueryRunner { } else */if (subentityURLToVO.size() == 0 && personURLToVO.size() == 0) { entity = new Entity(this.entityURI, "no-label"); } - + + after = System.currentTimeMillis(); + log.info("Time taken to iterate through the ResultSet of SELECT queries is in milliseconds: " + (after - before) ); return entity; } @@ -321,9 +326,15 @@ public class EntityGrantCountQueryRunner implements QueryRunner { throw new MalformedQueryParametersException( "URL parameter is either null or empty."); } - + + before = System.currentTimeMillis(); + ResultSet resultSet = executeQuery(this.entityURI, this.dataSource); - + + after = System.currentTimeMillis(); + + log.info("Time taken to execute the SELECT queries is in milliseconds: " + (after - before) ); + return createJavaValueObjects(resultSet); } } \ No newline at end of file diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java index 6199fc0d..f322cd91 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java @@ -279,7 +279,7 @@ public class EntityGrantCountRequestHandler implements yearGrantCount.add(currentGrantYear); } - log.info("entityJson.getLabel() : " + entityJson.getLabel() + " subOrganizationTypesResult " + subOrganizationTypesResult.toString()); + // log.info("entityJson.getLabel() : " + entityJson.getLabel() + " subOrganizationTypesResult " + subOrganizationTypesResult.toString()); entityJson.setYearToActivityCount(yearGrantCount); entityJson.getOrganizationType().addAll(subOrganizationTypesResult.get(entityJson.getLabel())); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountConstructQueryRunner.java new file mode 100644 index 00000000..5443dd4d --- /dev/null +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountConstructQueryRunner.java @@ -0,0 +1,206 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.persongrantcount; + +import java.util.HashSet; +import java.util.Set; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.hp.hpl.jena.iri.IRI; +import com.hp.hpl.jena.iri.IRIFactory; +import com.hp.hpl.jena.iri.Violation; +import com.hp.hpl.jena.query.DataSource; +import com.hp.hpl.jena.query.Query; +import com.hp.hpl.jena.query.QueryExecution; +import com.hp.hpl.jena.query.QueryExecutionFactory; +import com.hp.hpl.jena.query.QueryFactory; +import com.hp.hpl.jena.query.Syntax; +import com.hp.hpl.jena.rdf.model.Model; +import com.hp.hpl.jena.rdf.model.ModelFactory; + +import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; + +public class PersonGrantCountConstructQueryRunner { + + protected static final Syntax SYNTAX = Syntax.syntaxARQ; + + private String egoURI; + + private DataSource dataSource; + + private Log log = LogFactory.getLog(PersonGrantCountConstructQueryRunner.class.getName()); + + public PersonGrantCountConstructQueryRunner(String egoURI, DataSource dataSource, Log log){ + this.egoURI = egoURI; + this.dataSource = dataSource; + //this.log = log; + } + + private String generateConstructQueryForInvestigatorLabel(String queryURI) { + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> rdfs:label ?investigatorLabel ." + + "}" + + "WHERE {" + + "<"+queryURI+ "> rdfs:label ?investigatorLabel " + + "}"; + + return sparqlQuery; + } + + private String generateConstructQueryForInvestigatorGrants(String queryURI){ + + String sparqlQuery = "" + + "CONSTRUCT { " + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant rdfs:label ?GrantLabel " + + "} " + + "WHERE { " + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant rdfs:label ?GrantLabel " + + "} "; + + return sparqlQuery; + + } + + private String generateConstructQueryForDateTimeValueofRole(String queryURI){ + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + "?Role core:dateTimeInterval ?dateTimeIntervalValue . " + + "?dateTimeIntervalValue core:start ?startDate . " + + "?startDate core:dateTime ?startDateTimeValue . " + + "?dateTimeIntervalValue core:end ?endDate . " + + "?endDate core:dateTime ?endDateTimeValue . " + + "}" + + "WHERE { " + + "{" + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + "?Role core:dateTimeInterval ?dateTimeIntervalValue . " + + "?dateTimeIntervalValue core:start ?startDate . " + + "?startDate core:dateTime ?startDateTimeValue . " + + "} UNION " + + "{" + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + "?Role core:dateTimeInterval ?dateTimeIntervalValue . " + + "?dateTimeIntervalValue core:end ?endDate . " + + "?endDate core:dateTime ?endDateTimeValue . " + + "}" + + "}"; + + return sparqlQuery; + } + + private String generateConstructQueryForDateTimeValueofGrant(String queryURI){ + + String sparqlQuery = + "CONSTRUCT { " + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant core:dateTimeInterval ?dateTimeIntervalValueForGrant . " + + "?dateTimeIntervalValueForGrant core:start ?startDateForGrant . " + + "?startDateForGrant core:dateTime ?startDateTimeValueForGrant . " + + "?dateTimeIntervalValueForGrant core:end ?endDateForGrant . " + + "?endDateForGrant core:dateTime ?endDateTimeValueForGrant . " + + "}" + + "WHERE { " + + "{" + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant core:dateTimeInterval ?dateTimeIntervalValueForGrant . " + + "?dateTimeIntervalValueForGrant core:start ?startDateForGrant . " + + "?startDateForGrant core:dateTime ?startDateTimeValueForGrant . " + + "} UNION " + + "{" + + "<"+queryURI+ "> ?preboundProperty ?Role . " + + "?Role core:roleIn ?Grant ." + + "?Grant core:dateTimeInterval ?dateTimeIntervalValueForGrant . " + + "?dateTimeIntervalValueForGrant core:end ?endDateForGrant . " + + "?endDateForGrant core:dateTime ?endDateTimeValueForGrant . " + + "}" + + "}"; + + return sparqlQuery; + } + + private Model executeQuery(Set constructQueries, DataSource dataSource) { + + Model constructedModel = ModelFactory.createDefaultModel(); + + for (String queryString : constructQueries) { + + log.debug("CONSTRUCT query string : " + queryString); + + Query query = null; + + try{ + query = QueryFactory.create(QueryConstants.getSparqlPrefixQuery() + queryString, SYNTAX); + }catch(Throwable th){ + log.error("Could not create CONSTRUCT SPARQL query for query " + + "string. " + th.getMessage()); + log.error(queryString); + } + + QueryExecution qe = QueryExecutionFactory.create( + query, dataSource); + try { + qe.execConstruct(constructedModel); + } finally { + qe.close(); + } + + } + + return constructedModel; + } + + public Model getConstructedModel() + throws MalformedQueryParametersException { + + if (StringUtils.isNotBlank(this.egoURI)) { + /* + * To test for the validity of the URI submitted. + * */ + IRIFactory iRIFactory = IRIFactory.jenaImplementation(); + IRI iri = iRIFactory.create(this.egoURI); + if (iri.hasViolation(false)) { + String errorMsg = ((Violation) iri.violations(false).next()).getShortMessage(); + log.error("Person Grant Count Construct Query " + errorMsg); + throw new MalformedQueryParametersException( + "URI provided for an individual is malformed."); + } + } else { + throw new MalformedQueryParametersException("URI parameter is either null or empty."); + } + + Set constructQueries = new HashSet(); + + populateConstructQueries(constructQueries); + + Model model = executeQuery(constructQueries, + this.dataSource); + + return model; + + } + + private void populateConstructQueries(Set constructQueries) { + + constructQueries.add(generateConstructQueryForInvestigatorLabel(this.egoURI)); + constructQueries.add(generateConstructQueryForInvestigatorGrants(this.egoURI)); + constructQueries.add(generateConstructQueryForDateTimeValueofRole(this.egoURI)); + constructQueries.add(generateConstructQueryForDateTimeValueofGrant(this.egoURI)); + + + } + +} From 261af223694370ce19d76dda0d3cdcbb86eca7ce Mon Sep 17 00:00:00 2001 From: sjm222 Date: Wed, 9 Feb 2011 17:48:11 +0000 Subject: [PATCH 386/427] Use native uris for obo/eagle-i classes --- .../WEB-INF/filegraph/tbox/scires-1.2.owl | 159 +- .../WEB-INF/filegraph/tbox/vivo-core-1.2.owl | 2534 ++++++++--------- .../user/scires-1.2-annotations.rdf | 140 +- .../user/vivo-core-1.2-annotations.rdf | 182 +- productMods/WEB-INF/submodels/scires-1.2.owl | 159 +- .../WEB-INF/submodels/vivo-core-1.2.owl | 2534 ++++++++--------- 6 files changed, 2861 insertions(+), 2847 deletions(-) diff --git a/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl b/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl index 9858056b..36b87a36 100644 --- a/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl +++ b/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl @@ -13,42 +13,31 @@ xmlns:j.5="http://purl.org/dc/terms/" xmlns:xsd="http://www.w3.org/2001/XMLSchema#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > - - - + + - + + eagle-i: Material entity that is a portion or quantity of a biological material for use in testing, examination, or study. A biological specimen can be an individual animal, part of or derived an animal, plant, part of a plant, or microorganism. When a taxon is described, it is typically based on a single specimen and is referred to as the holotype. - - - - - - + An individual animal, part of or derived an animal, plant, part of a plant, or microorganism. + A portion or quantity of a biological material for use in testing, examination, or study. - number of human participants in the study (trial). - - - - An implement used to facilitate work, especially precision work. - An implement used to facilitate work, especially precision work. - - - - - A plan specification that allows different domain experts to reliably and independently reproduce a process. - A protocol is a plan specification which has sufficient level of detail and quantitative information to communicate it between domain experts, so that different domain experts will reliably be able to independently reproduce the process. - - + - - + + + + + + + A protocol is a plan specification which has sufficient level of detail and quantitative information to communicate it between domain experts, so that different domain experts will reliably be able to independently reproduce the process. + A plan specification that allows different domain experts to reliably and independently reproduce a process. @@ -59,95 +48,101 @@ Phase 4 Clinical Trial In Phase 4 trials, post marketing studies delineate additional information including the drug's or treatment's risks, benefits, and optimal use. - + - + + + + eagle-i: Research project that uses or collects measurements or assessments about humans. + Research project that uses or collects measurements or assessments about humans. + + - + Phase 2 Clinical Trial - + In Phase 2 trials, an experimental study drug or treatment is given to a larger group of people (100-300) to see if it is effective and to further evaluate its safety. - - An organism is a material entity that is an individual living system, such as animal, plant, bacteria or virus, that is capable of replicating or reproducing, growth and maintenance in the right environment. - OBI: An organism is material entity that is an individual living system, such as animal, plant, bacteria or virus, that is capable of replicating or reproducing, growth and maintenance in the right environment. An organism may be unicellular or made up, like humans, of many billions of cells divided into specialized tissues and organs. -NOTE that we are not addressing for now the issue of whether a foaf:Person is a subclass of obi:Organism - - - - A service that produces a physical object or data. - A service that produces a physical object or data, such as a custom micro-array chip, a made to order antibody, or a behavioral dataset + + ClinicalTrials.gov is an ICMJE-acceptable public registry, offering up-to-date information for locating clinical trials for a wide range of diseases and conditions. The U.S. National Institutes of Health (NIH), through its National Library of Medicine (NLM), developed this site in collaboration with the Food and Drug Administration (FDA), as a result of the FDA Modernization Act, which was passed into law in November 1997. - NCT00000419 - + + A service that produces a physical object or data, such as a custom micro-array chip, a made to order antibody, or a behavioral dataset + A service that produces a physical object or data. - - - - In Phase I trials, researchers test an experimental drug or treatment in a small group of people (20-80) for the first time to evaluate its safety, determine a safe dosage range, and identify side effects - Phase 1 Clinical Trial - - - - Research project that uses or collects measurements or assessments about humans. - - eagle-i: Research project that uses or collects measurements or assessments about humans. - - - - - Every clinical trial in the United States must be approved and monitored by an Institutional Review Board (IRB). An IRB is an independent committee of physicians, statisticians, community advocates and others whose objective is to ensure that a clinical trial is ethical and the rights of study participants are protected. - - - - A portion or quantity of a biological material for use in testing, examination, or study. - eagle-i: Material entity that is a portion or quantity of a biological material for use in testing, examination, or study. A biological specimen can be an individual animal, part of or derived an animal, plant, part of a plant, or microorganism. When a taxon is described, it is typically based on a single specimen and is referred to as the holotype. - An individual animal, part of or derived an animal, plant, part of a plant, or microorganism. - - - In Phase 3 trials, an experimental study drug or treatment is given to large groups of people (1,000-3,000) to confirm its effectiveness, monitor side effects, compare it to commonly used treatments, and collect information that will allow the experimental drug or treatment to be used safely. - - - - Phase 3 Clinical Trial - - + eagle-i: Material entity that is used in a chemical reaction or other experimental process to detect, measure, examine, or produce other substances. NOTE: For now we are not addressing whether this is a subclass of foaf:Agent Material entity that is used in a chemical reaction or other experimental process to detect, measure, examine, or produce other substances. - - + + + + + + + + In Phase I trials, researchers test an experimental drug or treatment in a small group of people (20-80) for the first time to evaluate its safety, determine a safe dosage range, and identify side effects + Phase 1 Clinical Trial + + + + An organism is a material entity that is an individual living system, such as animal, plant, bacteria or virus, that is capable of replicating or reproducing, growth and maintenance in the right environment. + OBI: An organism is material entity that is an individual living system, such as animal, plant, bacteria or virus, that is capable of replicating or reproducing, growth and maintenance in the right environment. An organism may be unicellular or made up, like humans, of many billions of cells divided into specialized tissues and organs. +NOTE that we are not addressing for now the issue of whether a foaf:Person is a subclass of obi:Organism + + + + A research study using human volunteers to answer specifc health-related questions. A clinical trial is a research study using human volunteers to answer questions about treatments for diseases and conditions. Clinical trials are conducted in phases. The trials at each phase have a different purpose and help scientists answer different questions. - A research study using human volunteers to answer specifc health-related questions. + + + + + Every clinical trial in the United States must be approved and monitored by an Institutional Review Board (IRB). An IRB is an independent committee of physicians, statisticians, community advocates and others whose objective is to ensure that a clinical trial is ethical and the rights of study participants are protected. + + + + + In Phase 3 trials, an experimental study drug or treatment is given to large groups of people (1,000-3,000) to confirm its effectiveness, monitor side effects, compare it to commonly used treatments, and collect information that will allow the experimental drug or treatment to be used safely. + + + Phase 3 Clinical Trial + + + + + An implement used to facilitate work, especially precision work. + + An implement used to facilitate work, especially precision work. - + Phase 0 is a recent designation for exploratory, first-in-human trials conducted in accordance with the United States Food and Drug Administration's (FDA) 2006 Guidance on Exploratory Investigational New Drug (IND) Studies. Phase 0 trials are also known as human microdosing studies and are designed to speed up the development of promising drugs or imaging agents by establishing very early on whether the drug or agent behaves in human subjects as was expected from preclinical studies. Phase 0 Clinical Trial @@ -156,10 +151,18 @@ NOTE: For now we are not addressing whether this is a subclass of foaf:Agent + + + + - - + + + + + + diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl index a04efb10..cba8556e 100644 --- a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl +++ b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl @@ -25,6 +25,11 @@ A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available in PubMed Central. The PMCID is issued shortly after the PI or author approves the PubMed Central formatted web version of the submission. + + + + + http://purl.org/ontology/bibo/ Short Definition from bibo ontology @@ -55,25 +60,15 @@ - - - - - - 1 - + + - 1 - - - - - - + + @@ -85,15 +80,20 @@ + + + 1 + + - - + 1 + - - + + @@ -119,51 +119,51 @@ + UN Cartographic Section UN Cartographic Section - + + + + + - - + - + + + + + + + Accounting & Research Services Assistant; Director of Information Technology Staff, support, and other non-academic positions. - + + A position classified as professional, staff, support, or any other non-academic role - - - - 1 - - - - - - 2 - http://purl.org/ontology/bibo/ A sub property of identifier (http://en.wikipedia.org/wiki/SICI). @@ -174,18 +174,18 @@ - 1 - + 1 + - - + 1 + + + - - @@ -196,6 +196,11 @@ + + + + + Definition take from: http://en.wikipedia.org/wiki/Government_agency. United States Library of Congress @@ -210,6 +215,11 @@ Public description modified from the information on this page: http://www.w3.org/TR/2005/WD-swbp-skos-core-guide-20050510/#sechierarchy . + + + + + @@ -225,6 +235,11 @@ + + + + + FAO's geopolitical ontology version 1.1 was populated with FAO, UN and internationally recognized data sources. FAO DISCLAIMER: The designations employed and the presentation of material do not imply the expression of any opinion whatsoever on the part of the Food and Agriculture Organization of the United Nations concerning the legal status of any country, territory, city or area, or of its authorities, or concerning the delimitation of its frontiers or boundaries. @@ -239,20 +254,15 @@ - - - 1 - - Definition take from: http://xmlns.com/foaf/spec/#term_based_near . foaf indicates that the status of this term is "unstable". "The based_near relationship relates two "spatial things" (anything that can be somewhere), the latter typically described using the geo:lat / geo:long geo-positioning vocabulary (http://www.w3.org/2003/01/geo/wgs84_pos#). This allows us to say describe the typical latitute and longitude of, say, a Person (people are spatial things - they can be places) without implying that a precise location has been given." Used to link an agent, related to bibliographic things, to a place where it is based near: can be a city, a monument, a building, etc. - + - 1 - + + @@ -260,42 +270,27 @@ - - - The most general classification of a person - + The most general classification of a person + + + - - - - - - - - - - - 1 - - - - - - - - + + + + @@ -306,21 +301,36 @@ Starting page number within a continuous page range. stable + + + + + + + + + + - + - 1 - + + + + + + + @@ -330,25 +340,20 @@ http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - - - - - - - - - - - 1 - + + - - + + + + + + + @@ -359,6 +364,11 @@ Works prepared by hand including handwritten or typescript drafts of pre-publication papers or works not otherwise reproduced in multiple copies http://purl.org/ontology/bibo/ + + + + + @@ -375,11 +385,6 @@ - - - 1 - - Smaller administrative division into which a country may be divided. @@ -389,10 +394,7 @@ - - - @@ -405,8 +407,8 @@ - + @@ -416,20 +418,43 @@ - + - + + + + + + + + 1 + + + + + 1 + + + + + + + + + + 1 + @@ -461,11 +486,6 @@ http://www.fao.org/termportal/contr/fr/ FAO terminology - - - 1 - - 2010-06-24 @@ -486,6 +506,11 @@ + + + 1 + + @@ -493,6 +518,16 @@ + + + 1 + + + + + 1 + + @@ -507,11 +542,6 @@ http://purl.org/ontology/bibo/ something that is printed or published and distributed, esp. a given number of a periodical - - - - - @@ -536,6 +566,11 @@ http://www.fao.org/termportal/contr/es/ + + + + + @@ -559,6 +594,11 @@ http://faostat.fao.org/default.aspx?lang=es FAOSTAT http://faostat.fao.org + + + 1 + + @@ -569,16 +609,16 @@ - - - - - A short written piece focused on an event or announcement of note, having a defined publication time and of less enduring interest than a news feature. + + + 1 + + @@ -607,11 +647,16 @@ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.iso.org/iso/fr/country_codes/iso_3166_code_lists.htm + + + 1 + + + - Authorship of journal articles, books and other original works is a means by which academics communicate the results of their scholarly work, establish priority for their discoveries, and build their reputation among their peers. This class allows for linking an author to a publication while indicating information about that author's authorship. Contains the authors name, their rank in the publication, and whether or not they are a corresponding author on the publication. @@ -625,6 +670,21 @@ This class allows for linking an author to a publication while indicating inform Bibo Definition: A seminar, discussion group, or the like, that emphasizes exchange of ideas and the demonstration and application of techniques, skills, etc. + + + 1 + + + + + + + + + + + + @@ -644,11 +704,11 @@ This class allows for linking an author to a publication while indicating inform Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio + Independent organizations formally working together toward a common goal, under an expressed agreement - - + @@ -657,20 +717,15 @@ This class allows for linking an author to a publication while indicating inform - + - + A group of related documents issued at regular intervals. + http://purl.org/ontology/bibo/ - + stable - - - - - 1 - @@ -710,18 +765,13 @@ This class allows for linking an author to a publication while indicating inform 1 - + - - - - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/en/ @@ -767,20 +817,10 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - - - This is done through a restriction on academic degree to allow the values from to be foaf:organization to be used as the range. @@ -826,11 +866,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - A unit devoted primarily to extension activities, whether for outreach or research. @@ -857,14 +892,14 @@ This class allows for linking an author to a publication while indicating inform - - - + + + - + - - + 1 + @@ -881,10 +916,10 @@ This class allows for linking an author to a publication while indicating inform - - - + + + Something designed, built, installed, etc., to serve a specific function or activity affording a convenience or service. @@ -893,20 +928,20 @@ This class allows for linking an author to a publication while indicating inform Use subclasses of core:Facility subclasses instead of this class if possible - - - - - A gathering of people for a defined purpose, not necessarily public or announced - - - + + 1 + + + + + + @@ -948,11 +983,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/es/ - - - 1 - - @@ -970,11 +1000,6 @@ This class allows for linking an author to a publication while indicating inform Either city or town - a thickly populated area having fixed boundaries and certain local powers of government. - - - - - @@ -984,21 +1009,26 @@ This class allows for linking an author to a publication while indicating inform + That is a position held by an academic faculty member who works for administration. - - Associate Dean An academic administrative position (associate dean, etc.) as distinct from a professional administrative position (non-academic) + server; Bruker Vector-33 FT-IR - + A network server is one example. Medical schools and research laboratories can list professional equipment, such as microscopes. - + A physical object provided for specific purpose, task or occupation. - + + + + + 1 + @@ -1010,25 +1040,25 @@ This class allows for linking an author to a publication while indicating inform - + http://purl.org/ontology/bibo/ A specific journal article - + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a periodical or book - Short Definition modified from the bibo ontology. + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine. stable - Director of Admissions and Placement; Associate University Librarian - Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. + Director of Admissions and Placement; Associate University Librarian + + Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. An employment activity, whether compensated or not. Short definition comes from http://en.wikipedia.org/wiki/Position, and has been modified. - @@ -1050,21 +1080,11 @@ This class allows for linking an author to a publication while indicating inform The source of the public description and this info is found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html. Bibo considers this term "unstable". The bibo editorial note is: "We are not defining, using an enumeration, the range of the bibo:degree to the defined list of bibo:ThesisDegree. We won't do it because we want people to be able to define new degress if needed by some special usecases. Creating such an enumeration would restrict this to happen." - - - - - - An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials - - - - - + @@ -1078,15 +1098,15 @@ This class allows for linking an author to a publication while indicating inform + + + + + - - - - - Relates a document to an event; for example, a paper to a conference. @@ -1133,15 +1153,15 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + - + - 1 - + + @@ -1154,15 +1174,10 @@ This class allows for linking an author to a publication while indicating inform http://faostat.fao.org/DesktopDefault.aspx?PageID=550&lang=es#ancor 2009-09-21 - + - - - - - - - + + @@ -1170,13 +1185,13 @@ This class allows for linking an author to a publication while indicating inform US Patent Data; US Job Data A named collection of data, usually containing only one type of data - + - - + + - + Computer program and its related documentation; directs the operation of a computer @@ -1214,10 +1229,10 @@ This class allows for linking an author to a publication while indicating inform - - - + + + http://www.fao.org/termportal/contr/es/ @@ -1233,16 +1248,6 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 http://www.fao.org/termportal/contr/en/ - - - 1 - - - - - 1 - - My extension program consists of developing and reporting disease management strategies that are both economically and environmentally sound for fresh market vegetable production. We hope that some of this testing will result in practices adaptable for organic production. @@ -1275,26 +1280,41 @@ This class allows for linking an author to a publication while indicating inform An activity of an individual within his or her profession or institution; use outreach provider role for community service or other activities outside the profession. - - - 1 - - Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - 1 - - - + + + + + + + + + 1 + + + + + + + + + + 1 + + + + + 1 + + @@ -1313,36 +1333,31 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 FAO terminology - - - 1 - - - - - - - - - + + - stable - + A scholarly academic article, typically published in a journal. + http://purl.org/ontology/bibo/ Written by scholars for other scholars, typically published in an academic journal with an abstract and bibliography A specific academic journal article - + 1 - + + + + + 1 + @@ -1355,15 +1370,15 @@ This class allows for linking an author to a publication while indicating inform - + - - + + - + 1 - + @@ -1379,11 +1394,6 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ - - - - - http://www.un.org/Depts/Cartographic/english/htmain.htm http://www.un.org/Depts/Cartographic/english/htmain.htm @@ -1395,35 +1405,10 @@ This class allows for linking an author to a publication while indicating inform http://www.un.org/Depts/Cartographic/french/htmain.htm UN Cartographic Section - + - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1439,16 +1424,6 @@ This class allows for linking an author to a publication while indicating inform A summary of the resource. stable - - - - - - - - - - Role of a person designated by a grantee to direct a project or activity being supported by a grant, and who is accountable to the grantee for the proper conduct of the project or activity. Also known as Program Director or Project Director. @@ -1474,6 +1449,16 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/en/ + + + + + + + + 1 + + http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -1487,6 +1472,11 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/es/ + + + + + @@ -1509,13 +1499,18 @@ This class allows for linking an author to a publication while indicating inform + + + + + Definition taken from: http://en.wikipedia.org/wiki/University + University of Florida; Washington University in St. Louis An institution of higher education and research, which grants academic degrees in a variety of subjects, and provides both undergraduate education and postgraduate education. - @@ -1523,58 +1518,43 @@ This class allows for linking an author to a publication while indicating inform Definition from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html - - - - - - - - - - - - - - - - - - - - - - - - - Top level of all location classes. It's anticipated that the subclasses will be used when classifying items. And, all locations can be viewable via this class. Use subclasses of core:Location when classsifying items. - + - - - - - - - + + + A document created as a basis for discussion or a very early draft of a formal paper - - + + + + + + + + + + 1 + + + + + + @@ -1592,11 +1572,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - source: http://en.wikipedia.org/wiki/Issn @@ -1605,10 +1580,10 @@ This class allows for linking an author to a publication while indicating inform International Standard Serial Number - - - + + + @@ -1617,21 +1592,6 @@ This class allows for linking an author to a publication while indicating inform source of definition: http://www.uspto.gov/main/glossary/#p . The following site has patent number formats: http://www.uspto.gov/patents/ebc/kindcodesum.jsp . - - - - - - - - - - - - - - - @@ -1640,7 +1600,6 @@ This class allows for linking an author to a publication while indicating inform - http://purl.org/ontology/bibo/ @@ -1649,6 +1608,7 @@ This class allows for linking an author to a publication while indicating inform A periodical of scholarly journal Articles. Contains original scholarly research or review articles by experts in the field Journal of Information Science; IEEE Intelligent System; Scientometrics + http://purl.org/ontology/bibo/ @@ -1659,20 +1619,20 @@ This class allows for linking an author to a publication while indicating inform Contains news articles, opinions, features, advertising, and is usually issued daily or weekly - - + - + + - - - + + + - + - - + 1 + @@ -1696,20 +1656,20 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - - - - + - - + + + + + + + + + + + + @@ -1723,15 +1683,25 @@ This class allows for linking an author to a publication while indicating inform - + - + + + + + + + + + + + + Wiley Prize in Biomedical Sciences - An Award or Honor An Award or Honor @@ -1748,25 +1718,15 @@ This class allows for linking an author to a publication while indicating inform - + + - - + - + - - - - - - - - - - - - + 1 + @@ -1782,21 +1742,26 @@ This class allows for linking an author to a publication while indicating inform An agent that receives a communication document. + + + + + - + + + + + - - - + Only use if no specific subclasses of core:EventSeries desribe the activity. + A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. - - - - + + Two or more events that follow on one after the other or are connected one after the other. - - + @@ -1806,20 +1771,25 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + - + + + 1 + + + + + - - @@ -1827,6 +1797,11 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + @@ -1840,21 +1815,26 @@ This class allows for linking an author to a publication while indicating inform use one freetextKeyword assertion for each keyword or phrase. - - - - - We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. + + + + + + + + 1 + + @@ -1862,39 +1842,54 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + + + + + + - Represents educational training that has been received. + This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree. - Currently any abstract name is given to individuals of this class. This could change in the future. + + + + + + - + A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue - + + + + + + - - - - - http://purl.org/ontology/bibo/ + Facebook; VIVOweb.org; Flickr A group of Webpages accessible on the Web. A group of webpages available within a specific parent address or URL on the World Wide Web - unstable @@ -1914,7 +1909,7 @@ We would like the range of core:outcome to be the union of Event and Process; an Work consisting of collections of previously published works - + Short Definition is the Medical Subject Heading (MeSH) definition A document that simultaneously contains other documents. http://purl.org/ontology/bibo/ @@ -1925,16 +1920,26 @@ We would like the range of core:outcome to be the union of Event and Process; an a reified relationship + + + + + - An area of corporate activity organized as an administrative or functional unit. Definition modified from http://www.thefreedictionary.com/division. It is difficult to tell the difference between a division and a department. Cardiovascular Medicine (division within medicine) + + + + + + The Ornithological Newsletter @@ -1942,10 +1947,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - + + + @@ -1955,9 +1960,9 @@ We would like the range of core:outcome to be the union of Event and Process; an VIVO Outreach Team; VIVO Ontology Team + An informal organization brought together for the purposes of a project or event. - @@ -1975,6 +1980,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + Definition take from: http://dictionary.reference.com/browse/hospital. Shands at the University of Florida @@ -1993,13 +2003,18 @@ We would like the range of core:outcome to be the union of Event and Process; an The academic degree of a Thesis - + Alchohol Education Center; Center for Arts and Public Policy; Hearing Research Center A place where a particular activity or service is concentrated. Short Definition take from http://www.thefreedictionary.com/center. + + + + + Country area, area of the country including area under inland water bodies, but excluding offshore territorial waters. Possible variations in the data may be due to updating and revisions of the country data and not necessarily to any change of area. Data are expressed in 1000 hectares. http://faostat.fao.org/site/375/default.aspx FAOSTAT @@ -2011,25 +2026,10 @@ We would like the range of core:outcome to be the union of Event and Process; an http://faostat.fao.org/site/377/default.aspx FAOSTAT http://faostat.fao.org/site/377/default.aspx - - - 1 - - Indicates the precision of the value of a DateTimeValue instance. - - - - - - - - - - For example an HR job title for a person might be - Assistant University Librarian, and the preferred job title for that same person could be - Physical Sciences Librarian. @@ -2038,14 +2038,14 @@ We would like the range of core:outcome to be the union of Event and Process; an + - Short Definition from OCLC Input Standards, EntW A document created to summarize research findings associated with the completion of an academic degree. stable + http://purl.org/ontology/bibo/ Works created to satisfy the requirements for an academic certification or degree; also called dissertation - @@ -2055,6 +2055,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + @@ -2076,11 +2081,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Only use if no specific subclasses of core:Role describe the role. - - + A person's or organization's type of contribution to an endeavor Only use this broad role class if no subclasses of role describe the item being classified. + @@ -2100,10 +2105,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + 1 - + + + + + + @@ -2124,10 +2134,10 @@ We would like the range of core:outcome to be the union of Event and Process; an UN Cartographic Section - A structured file of information or a set of logically related data stored and retrieved using computer-based means Short Definition is the Medical Subject Heading (MeSH) definition + PubMed @@ -2137,16 +2147,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - - - stable http://purl.org/ontology/bibo/ @@ -2156,7 +2156,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A meeting for consultation or discussion. - + @@ -2166,30 +2166,30 @@ We would like the range of core:outcome to be the union of Event and Process; an - + A distinct, usually ongoing and specialized unit within a large organization. Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division. Legal (department within a company); Use for any non-academic department - + - - + 1 + An online article or commentary appearing on a blog - A specific blog posting + + Collection of documents or information resources that have a unified identity stable - Collection of documents or information resources that have a unified identity. Archives, museums and libraries often acquire collections on specific subjects and from distinguished authors or researchers. Also includes collections of resources bundled into a license. http://purl.org/ontology/bibo/ Hill Ornithology Collection; Wiley Interscience Online Books Biochemisty Collection @@ -2205,6 +2205,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable + + + 1 + + A private company is one that is privately-owned, and thus, is not publicly-traded in the stock market. Members of the general public cannot purchase stock in a private company unless that company chooses to go public and become a public company. @@ -2212,6 +2217,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition obtained here: http://answers.ask.com/Business/Finance/what_is_a_private_company. Examples of private companies found here: http://www.forbes.com/2008/11/03/largest-private-companies-biz-privates08-cx_sr_1103private_land.html + + + + + @@ -2222,8 +2232,8 @@ We would like the range of core:outcome to be the union of Event and Process; an B.A. Bachelor of Arts This list may have multiple abbreviations for some degrees. An academic degree at any level, both as reported by individuals for employment and as offered by academic degree programs. - - + + @@ -2241,11 +2251,6 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal document proposing or enacting a law or a group of laws. - - - 1 - - Minnesota; Michigan; Indiana; New York; Quebec; Manitoba; Ontario Source of the Short Definition: http://www.thefreedictionary.com/state. @@ -2268,6 +2273,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -2276,19 +2286,14 @@ We would like the range of core:outcome to be the union of Event and Process; an - + phonograph record; tape; CD; DVD; DAT An audio document; aka record. http://purl.org/ontology/bibo/ stable Recorded audio in any format - - - - - http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49chgef.htm @@ -2323,13 +2328,18 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ 2010-06-24 + + + + + http://purl.org/ontology/bibo/ film; video; Blu-ray Audiovisual recording in any format - + stable An audio-visual document; film, video, and so forth. @@ -2341,6 +2351,11 @@ We would like the range of core:outcome to be the union of Event and Process; an An area of land distinguished by its political autonomy. Politically independent territories. + + + + + Use subclasses of core:Geographic Region subclasses instead of this class if possible. @@ -2348,11 +2363,6 @@ We would like the range of core:outcome to be the union of Event and Process; an A location having coordinates in geographic space. - - - 1 - - Text of a speech written in preparation for delivery of the speech. @@ -2382,10 +2392,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + + @@ -2415,7 +2425,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A defined class of organizations that fund Grants. - + National Institute of Health (NIH) @@ -2428,24 +2438,19 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition found here: http://dictionary.reference.com/browse/publisher A person or company whose business is the publishing of books, periodicals, engravings, computer software, etc. + Elsevier; Harper & Row; Indiana University Press - + + + + 1 + - - - - - - - - 1 - - A student organization is an organization, operated by students at a university, whose membership normally consists only of students. Dancin' Gators @@ -2458,6 +2463,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Afghanistan; Antigua and Barbuda; Cameroon; Iceland; Jamaica; Nigeria; United States of America + + + + + @@ -2466,11 +2476,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - 2010-06-24 @@ -2493,11 +2498,16 @@ We would like the range of core:outcome to be the union of Event and Process; an The full URL. - Uniform Resource Locator (URL) specifies where an identified resource is available and the mechanism for retrieving it. + http://info.slis.indiana.edu/~katy/ + + + + + @@ -2524,11 +2534,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable - - - 1 - - http://www.fao.org/termportal/contr/ar/ @@ -2549,16 +2554,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - - - Short Definition copied from bibo ontology @@ -2574,52 +2569,32 @@ We would like the range of core:outcome to be the union of Event and Process; an Public Definition source (http://www.answers.com/topic/publisher). - - - - - An Institute normally has a research focus but may also fulfill instructional or outreach roles. Institute for Fundamental Theory - + - 1 - + + + This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. Only use if no specific subclasses of foaf:organization desribe the organization. - A generic class encompassing several types of organizations. - - - - + + + + - - + + Ued to describe an organization related to bibliographic items such as a publishing company, etc. - - - - - - - - - - - - - - - http://www.fao.org/termportal/contr/fr/ http://www.fao.org/termportal/contr/es/ @@ -2639,6 +2614,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + @@ -2652,57 +2632,27 @@ We would like the range of core:outcome to be the union of Event and Process; an definition modified from: source (http://en.wikipedia.org/wiki/Seating_capacity). 55 - - - - - - - - - - - - - - - The digital file (or physical equivalent), if available after the conference, vs. the act of attending/presenting: use ConferencePresentation for information about date/time/location/name of the event where the poster was presented - - - 1 - - An organized series of workshop events, whether repetitions of the same workshop or multiple different workshops. Use workshop for individual events. + + + + + - - - - - - - - - - - - 1 - - - @@ -2715,24 +2665,24 @@ We would like the range of core:outcome to be the union of Event and Process; an + - - Only use if no specific subclasses of event:Event are appropriate. - - - + + This class will also display instances of subclasses under Event, e.g. Philosophy Department Discussion Club; 2009 Racker Lecture; screening of a documentary. In addition to a location in space and time, an event may have any or all the following qualities: actively participating agents, passive factors, work products. Also, it may be in a virtual space or part of a series such as a lecture series. The previous short definition was: "An arbitrary classification of a space/time region, by a cognitive agent." - - - - - + + + + + + + Something that happens at a given place and time. - - + + @@ -2742,11 +2692,6 @@ The previous short definition was: "An arbitrary classification of a space/time http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - - - - - http://www.fao.org/termportal/en/ @@ -2766,10 +2711,10 @@ The previous short definition was: "An arbitrary classification of a space/time - - - + + + @@ -2777,6 +2722,16 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + + + + + + A visual representation such as a photograph or graph @@ -2801,22 +2756,12 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - - - - - - - + + An award, honor, or distinction received by a person on a particular date (not the award itself as given repeatedly, and not a grant award). - - + A specific award on a particular date or for a particular date range. Ninth annual Wiley Prize in Biomedical Sciences, for the discovery of a light activated ion channel @@ -2848,28 +2793,13 @@ The previous short definition was: "An arbitrary classification of a space/time Role of co-principal investigator of a grant, who devotes a specified percentage of time and is considered key personnel. - - - - - - - - - - - - - - - Professor, associate professor and assistant professor are common positions for academic faculty. + Professor; Associate Professor; Assistant Professor Academic position in a university or institution + - - @@ -2880,21 +2810,26 @@ The previous short definition was: "An arbitrary classification of a space/time http://en.wikipedia.org/wiki/Global_Trade_Item_Number. Global Trade Item Number 14 + + + + + The dual relationship of a professor advising a student and the student being advised by a professor, typically including start and end dates - + - + - + + - 1 - + @@ -2906,6 +2841,16 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + + + + + + @@ -2927,11 +2872,26 @@ modern society using the world of Star trek. Los Angeles Times, March An section number + + + 1 + + + + + + + + + + + + http://www.fao.org/termportal/contr/en/ http://www.fao.org/termportal/contr/es/ @@ -2950,11 +2910,6 @@ modern society using the world of Star trek. Los Angeles Times, March This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - - - http://purl.org/ontology/bibo/ @@ -2963,28 +2918,23 @@ modern society using the world of Star trek. Los Angeles Times, March An agent that interview another agent. - + + - 1 - - - - - - + + + + + + - - - 1 - - @@ -2997,15 +2947,15 @@ modern society using the world of Star trek. Los Angeles Times, March a specific period or duration, defined by (optional) start and end date/times. - + - - + 1 + - - - + + + @@ -3023,15 +2973,15 @@ modern society using the world of Star trek. Los Angeles Times, March Short Definition from bibo ontology - + - - + + - + 1 - + @@ -3056,12 +3006,32 @@ modern society using the world of Star trek. Los Angeles Times, March 2010-06-24 http://www.fao.org/termportal/contr/zh/ + + + + + The value of the datatype property *validSince* associated to a particular area (territory or group) indicates the area's first year of validity. The geopolitical ontology traces back historic changes only until 1985, therefore, if an area has a validSince = 1985, this indicates that the area is/was valid since 1985 or before. + + + + + + + + + + + + + 1 + + @@ -3074,6 +3044,16 @@ modern society using the world of Star trek. Los Angeles Times, March + + + 1 + + + + + + + @@ -3092,26 +3072,6 @@ source: http://en.wikipedia.org/wiki/ORCID . Public definition source: http://dublincore.org/2008/01/14/dcterms.rdf# . Examples of a Publisher include a person, an organization, or a service. Typically, the name of a Publisher should be used to indicate the entity. - - - 1 - - - - - - - - - - - - - - - - - FAO terminology http://www.fao.org/termportal/en/ @@ -3150,11 +3110,6 @@ Examples of a Publisher include a person, an organization, or a service. Typical A presentation of a series of slides, usually presented in front of an audience with written text and images. stable - - - 1 - - @@ -3187,6 +3142,26 @@ Examples of a Publisher include a person, an organization, or a service. Typical http://purl.org/ontology/bibo/ + + + 1 + + + + + + + + + + + + + + + + + http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -3200,6 +3175,11 @@ Examples of a Publisher include a person, an organization, or a service. Typical 2010-06-24 + + + 1 + + @@ -3209,25 +3189,15 @@ Examples of a Publisher include a person, an organization, or a service. Typical A distinct, usually specialized educational unit within an educational organization. + - Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts) - + - 1 - - - - - - - - - - - + + @@ -3263,27 +3233,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/Critical or explanatory note for a Document. - - - - - - - - 1 - - - - + + + + An intramural or extramural award to support scholarly work, such as UF09179 (VIVO) Short definition is from the Glossary of NIH Terms. - - + Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity - @@ -3318,11 +3278,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Information Science; Computer Science; Anthropology - - - - - This namespace - http://purl.org/dc/elements/1.1/ - does not appear to have this element. @@ -3352,6 +3307,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/2010-06-24 http://www.fao.org/termportal/en/ + + + + + Universal Product Code @@ -3366,11 +3326,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3378,15 +3333,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/Intel Talent Search; poetry contest Not the same as an award or distinction. - - - + - - - - - + + @@ -3408,6 +3358,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3424,10 +3379,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ 0.7 - - - + + + http://purl.org/ontology/bibo/ @@ -3442,22 +3397,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Address has properties for department name, street, city, state or province, postal code, and country. For US specific address, classify using core:US Postal Code. core:Address will display all addresses. + University of Waterloo, 200 University Avenue West, Waterloo, Ontario, Canada N2L 3G1 - A code and abstract concept expressing a location on the Earth's surface. To classify US specific addresses, use core:US Postal Code. - - - - - - Librarian; Library Systems Analyst; Music Bibliographer It is the common position in libraries. + A position held by library and information science professionals, or academic or technical experts, in support of providing information services or materials - + @@ -3473,6 +3423,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/es/ + + + + + + + + 1 + + @@ -3485,6 +3445,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + http://purl.org/ontology/bibo/ stable @@ -3493,16 +3458,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/Library of Congress Control Number Source: http://en.wikipedia.org/wiki/Library_of_Congress_Control_Number. - - - - - - - - - - @@ -3510,12 +3465,22 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + A group can also be an organization but need not be; typically used for looser associations of people or organizations acting together in some fashion, not necessarily through formal agreement or on a long-term basis. Added to the VIVO ontology to be able to support informal and perhaps even private groups of people around an idea, funding opportunity, or event. A group of agents + + + 1 + + http://purl.org/ontology/bibo/ unstable @@ -3524,24 +3489,19 @@ Definition source: http://isiwebofknowledge.com/researcherid/A chapter of a book. A main division of a book - - - 1 - - - - - - - Curriculum Steering Committee; PhD Advisory Committee A group of people organized for a specific purpose (e.g., a reporting or advisory role), often with a charge and for a specific duration. - + There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important. + + + + + Short Definition from OCLC Input Standards, EntW http://purl.org/ontology/bibo/ @@ -3574,14 +3534,19 @@ Definition source: http://isiwebofknowledge.com/researcherid/This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. + + + + + - + 1320 East 10th Street, Wells Library 021 Bloomington, IN 47405 + + Formal address in US postal address system. - - US postal address follow the format street, apt or office number (optional), city, state, and zipcode. @@ -3595,15 +3560,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - 1 - - - - - 1 - + + @@ -3618,15 +3578,20 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print. + + + + + - - - - + + Short Definition from the bibo ontology unstable A section of a book + + http://purl.org/ontology/bibo/ A section of a book. @@ -3642,6 +3607,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + + + + + A court associated with a legal document; for example, that which issues a decision. @@ -3656,6 +3631,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + radio or newspaper interview @@ -3672,6 +3652,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + + + + + Definition was take from here: http://dictionary.reference.com/browse/museum @@ -3679,11 +3669,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/The Getty Museum A building or place where works of art, scientific specimens, or other objects of permanent value are kept and displayed. - - - 1 - - unstable http://purl.org/ontology/bibo/ @@ -3692,11 +3677,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3716,6 +3696,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/fr/ + + + + + @@ -3732,10 +3717,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - + + + + + + + 1 + @@ -3749,16 +3739,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - - - - - - @@ -3789,6 +3769,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/Not sure how to access the "Editor's Comments". But as North America is a continent, it would be placed directly into the continent subclass and viewable through this class along with any other subclass entities. Any region that goes beyond national boundaries and does not fit into any subclass of core:TransnationalRegion. + + + + + @@ -3808,15 +3793,20 @@ Definition source: http://isiwebofknowledge.com/researcherid/ B.A. + + + + + A person holding a position that is not considered to be an academic appointment. - - - + + + @@ -3830,10 +3820,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - 1 - + + @@ -3842,6 +3832,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + + + 1 + + A location having coordinates in geographic space. @@ -3849,16 +3849,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Use subclasses of core:Geographic Location subclasses instead of this class if possible. - - - - - - - - - - @@ -3878,16 +3868,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - - - - 1 - - @@ -3915,6 +3895,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/Used for a single narrative summary of research, typically covering a wide range of activities and time periods; use Researcher Role for information on individual activities + + + + + A role involving research (funded or unfunded), sometimes linked to a grant @@ -3931,20 +3916,20 @@ Definition source: http://isiwebofknowledge.com/researcherid/unstable - - - - - - + - 1 - + + + + + + + @@ -3955,11 +3940,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/Publication Description source http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . This term is also considered unstable. unstable - - - - - @@ -3971,13 +3951,18 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + + - An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support - - + + + + + + + 1 + @@ -4009,16 +3994,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - 1 - - - - - - - FAO terminology @@ -4032,6 +4007,11 @@ bibo has the domain of this property set to the union of Collection and Document 2010-06-24 + + + + + FAO terminology @@ -4045,10 +4025,30 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/ar/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + + + + + + + + + + + + + + + + 1 + + http://purl.org/ontology/bibo/ @@ -4057,35 +4057,25 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - - - - - - - - - - - - - - 1 - - + + + 1 + + + + + + + @@ -4097,11 +4087,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - @@ -4128,6 +4113,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + http://www.fao.org/termportal/contr/es/ @@ -4164,19 +4154,24 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + - - + A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate Short Definition from the bibo ontology - + stable + + + http://purl.org/ontology/bibo/ - - + A document (noun) is a bounded physical representation of body of information designed with the capacity (and usually intent) to communicate. A document may manifest symbolic, diagrammatic or sensory-representational information. - A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate @@ -4184,12 +4179,22 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + + + + 1 + + FAO terminology 2010-06-24 @@ -4208,10 +4213,10 @@ bibo has the domain of this property set to the union of Collection and Document - - + - + 1 + @@ -4227,16 +4232,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - - - - - - FAO terminology http://www.fao.org/termportal/contr/ar/ @@ -4264,28 +4259,18 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - 1 - - - + An edited book. - http://purl.org/ontology/bibo/ - + + + Best American Science Writing 2009 stable An edited collection of stand-alone articles published as a book - - - - - - Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible. @@ -4300,6 +4285,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + + + + 1 + + 100 Caldwell Hall; 114 Martha Van Rensselaer (Rushmore Conference Room) Room that provides a particular service or is used for a particular activity. @@ -4307,49 +4302,64 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Enter room number of name. + + + 1 + + + + + + + + + + 1 + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - 1 - + + + + + + @@ -4357,16 +4367,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Medicine - - - - - - - - 1 - - http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/ar/ @@ -4380,6 +4380,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://www.fao.org/termportal/contr/zh/ + + + 1 + + @@ -4392,10 +4397,15 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + 1 - + + + + + + @@ -4410,33 +4420,28 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi 2010-06-24 http://www.fao.org/termportal/contr/ar/ + + + 1 + + + College of Arts & Sciences; Ivy Tech Community College A primary academic unit within a University or a free-standing higher education organization without graduate degree programs. - + + + + + Document1 isVersionOf Document2 This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - - - - - - 1 - - - - - - - @@ -4461,6 +4466,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + + + + + + @@ -4468,6 +4483,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + http://purl.org/ontology/bibo/ Supreme Court Reporter @@ -4477,6 +4497,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Collection of legal cases stable + + + 1 + + + + + 1 + + http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/en/ @@ -4490,41 +4520,51 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - - - - - - 1 - - - - - + + + - + - + - - + + + + + + + + + + + + + + + 1 + + + + + 1 + + @@ -4533,11 +4573,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi UITS service + UITS service is the information technology services provided by Indiana University. SC. - - A regularly offered service in support of an academic, research, or administrative function (not personal or professional service by an individual) + @@ -4545,29 +4585,24 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - 1 - - - - - 1 - + + - - - - - + + + 1 + + Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. @@ -4580,11 +4615,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi The grounds of a school, college, university, or hospital. Or, a large, usually suburban, landscaped business or industrial site. - - - - - @@ -4600,23 +4630,28 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ Short Definition from the bibo ontology + + + + + - - - 1 - - This is done with a restriction on agent. - + + + 1 + + + @@ -4634,8 +4669,8 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + Used information from this definition: http://dictionary.reference.com/browse/library. - A collection of any materials, for study and enjoyment, which has been systematically arranged. Marston Science Library @@ -4653,30 +4688,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ - - - 1 - - - - - - - - - - - - - + - - - - - 1 - + http://www.fao.org/termportal/contr/ar/ @@ -4691,10 +4706,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - + - 1 - + + @@ -4714,6 +4729,21 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . + + + 1 + + + + + + + + + + + + @@ -4725,20 +4755,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi full email address - + 1 - - - - - - - - - - 1 - + @@ -4746,24 +4766,24 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - - - + + + + + + + 1 + Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. - - - + + + + - - - - - - - + @@ -4778,21 +4798,16 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + For data ingest from authoritative sources to record the actual way a person was listed as author, as potentially valuable information for author disambiguation. - - - - - - - - - - @@ -4815,24 +4830,24 @@ We would like the range of core:outcome to be the union of Event and Process; an http://aims.fao.org/website/Search-AGROVOC/sub http://aims.fao.org/website/Search-AGROVOC/sub - + 1 - + Used to link a bibliographic item to one of its contributor: can be an author, an editor, a publisher, etc. - + 1 - + - + + + - - @@ -4840,6 +4855,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -4856,21 +4876,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Any organization (likely also asserted as another class of Organization) with a primary, ongoing research function, not just through occasional roles - - - - - The result of rendering a work from one language to another - - - - - @@ -4882,6 +4892,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition http://en.wikipedia.org/wiki/Job_title#Job_title. + + + + + @@ -4901,17 +4916,17 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + - 1 - + Medical Subject Heading (MeSH) definition of Technical Report: Work consisting of a formal report giving details of the investigation and results of a medical or other scientific problem. When issued by a government agency or comparable official body, its contents may be classified, unclassified, or declassified with regard to security clearance. This publication type may also cover a scientific paper or article that records the current state or current position of scientific research and development. If so labeled by the editor or publisher, this publication type may be properly used for journal articles. A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc.. http://purl.org/ontology/bibo/ - + A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc. stable @@ -4947,35 +4962,30 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/fr/ - - - - - - - - - - - - - - + - - - + + + + + + + + + + + @@ -4986,15 +4996,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + + - 1 - - - - - - @@ -5007,11 +5012,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - For individual, separate conferences, use conference instead. core:ConferenceSeries and core:SeminarSeries are very similar. @@ -5023,6 +5023,11 @@ We would like the range of core:outcome to be the union of Event and Process; an A person registered in an undergraduate program leading to a bachelor's degree or an undergraduate diploma or certificate. + + + + + An excerpted collection of words @@ -5032,25 +5037,25 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ Short Definition from the bibo ontology - - - - - - + A position involving academic work but without faculty status Researcher; Academic Extension Associate; Postdoctoral Associate - Those positions are held by people who do academic work but do not have faculty positions in universities or institutes. + + + 1 + + + Currently being used by a restriction on organization. @@ -5070,19 +5075,24 @@ We would like the range of core:outcome to be the union of Event and Process; an An outreach or community service role directed outside a person's primary profession and institution Communicating Astronomy to the Public - + - - + + 2 + + + + 1 + stable + A loose, thematic, collection of Documents, often Books. + A thematic collection of documents, usually books, issued at regular or irregular intervals http://purl.org/ontology/bibo/ - - Methods in Molecular Biology @@ -5092,6 +5102,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + Definition take from: http://dictionary.reference.com/browse/foundation. An institution financed by a donation or legacy to aid research, education, the arts, etc. @@ -5128,15 +5143,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - 1 - - - - - - + + @@ -5151,9 +5161,14 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet + + + + + - + Short Definition modified from the one found here: http://www.thefreedictionary.com/county. Alachua; Baker; Bradford; Kenora; Ottawa; Waterloo @@ -5182,41 +5197,36 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - - Short Definition from the bibo ontology - A distinct part of a larger document or collected document + http://purl.org/ontology/bibo/ a distinct part of a larger document or collected document. unstable - + + - + - - + + - + + - Short Definition copied from bibo ontology - - http://purl.org/ontology/bibo/ + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers. + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers - stable + @@ -5225,6 +5235,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + @@ -5234,26 +5249,36 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + + + + + + + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. + + + + - - - - An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. - - - An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. - - - + + + 1 + - + + + + + + 1 - + @@ -5261,16 +5286,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - - - - 1 - - @@ -5282,6 +5297,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A URLLink that is designated (by the user or anyone else) as a primary link for the person, organization, event, etc. + + + + + @@ -5300,20 +5320,30 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Note: Bibo:editor is used as the inverse of core:editorOf. Public Description for bibo:editor was obtained from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - + + - - + + + + + + A postdoctoral training appointment (job) - + - - + 1 + + + + + + @@ -5337,11 +5367,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - @@ -5366,11 +5391,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - @@ -5378,6 +5398,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + @@ -5386,16 +5411,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - - - - - - The name defining a special edition of a document. Normally its a literal value composed of a version number and words. @@ -5416,16 +5431,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/termportal/en/ 2010-06-24 - - - 1 - - - - - - - @@ -5435,6 +5440,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + 1 + + 2010-04-01 UN Statistics Division http://unstats.un.org/unsd/methods/m49/m49alpha.htm @@ -5445,16 +5455,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49alpha.htm - - - - - - - - - - paraphrased editorial note from the bibo ontology: We are not defining, using an enumeration, the range of the bibo:status to be a defined list of bibo:DocumentStatus. This is because we want people to be able to define new statuses if needed; and creating such an enumeration would prevent this. @@ -5462,12 +5462,12 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - A list of items in a collection; an ordered compilation of item descriptions and sufficient information to afford access to them + NLM Catalog Short Definition is the Medical Subject Heading (MeSH) definition - + diff --git a/productMods/WEB-INF/ontologies/user/scires-1.2-annotations.rdf b/productMods/WEB-INF/ontologies/user/scires-1.2-annotations.rdf index c7a781a7..fc820434 100644 --- a/productMods/WEB-INF/ontologies/user/scires-1.2-annotations.rdf +++ b/productMods/WEB-INF/ontologies/user/scires-1.2-annotations.rdf @@ -12,49 +12,29 @@ xmlns:j.5="http://purl.org/dc/terms/" xmlns:xsd="http://www.w3.org/2001/XMLSchema#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > - - - - - 20 - -1 - StorageService + + obo + Open Biological and Biomedical Ontologies - - - - - -1 + -1 - ResearchProject + -1 + + + Biological Specimen + - study population count 20 + study population count - - - 10 - - Instrument - -1 - - - - -1 - - - 15 - - Protocol - - true realizesProtocol + @@ -63,6 +43,14 @@ documentationFor + + + + -1 + Protocol + 15 + + 4 Phase 4 Clinical Trial @@ -81,6 +69,14 @@ Scientific Research scires + + + -1 + + Human Study + -1 + + providesAccessTo @@ -95,21 +91,13 @@ -1 - - - - -1 + + StorageService -1 - - Organism - - - ProductionService - 20 - + - -1 + 1 @@ -120,13 +108,21 @@ ClinicalTrials.gov registry number - + - + ProductionService -1 + 20 - AccessService + + + + -1 + -1 + + + Reagent @@ -136,28 +132,27 @@ Phase 1 Clinical Trial -1 - + + Organism + + -1 + -1 - -1 - Human Study - - -1 - + + ClinicalTrial + 1 -1 - Biological Specimen - -1 - - Institutional Review Board (IRB) number for a Clinical Trial Institutional Review Board (IRB) number + @@ -167,20 +162,13 @@ -1 - - Reagent - + - -1 + + Instrument -1 - - - - - -1 - 1 - ClinicalTrial + 10 @@ -197,10 +185,26 @@ hasDocumentation + + ResearchProject + -1 + -1 + + + + - true protocolRealizedBy + true + + + AccessService + 20 + + -1 + + diff --git a/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf b/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf index dce6254a..a40f0ec0 100644 --- a/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf +++ b/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf @@ -347,14 +347,6 @@ - - StorageService - -1 - 20 - - - - true @@ -405,6 +397,14 @@ + + + + -1 + Protocol + 15 + + 4 Phase 4 Clinical Trial @@ -786,15 +786,30 @@ + + Reagent + + + -1 + -1 + + nameOfficialIT + + + -1 + 1 + ClinicalTrial + + - Institutional Review Board (IRB) number Institutional Review Board (IRB) number for a Clinical Trial + Institutional Review Board (IRB) number @@ -1031,14 +1046,6 @@ - - - - Reagent - - -1 - -1 - @@ -1046,6 +1053,14 @@ Authorship -1 + + + + Instrument + -1 + + 10 + Workshop @@ -1594,6 +1609,14 @@ 5 current positions + + + -1 + + Human Study + -1 + + -1 @@ -1761,6 +1784,14 @@ locator + + + + + -1 + ResearchProject + -1 + Position -1 @@ -1863,6 +1894,10 @@ Please enter the complete phone number for your fax, with area code and also country code (if outside the US). + + obo + Open Biological and Biomedical Ontologies + 5 @@ -2011,14 +2046,6 @@ transcriptOf Relates a document to some transcribed original. - - ProductionService - - 20 - - - -1 - @@ -2182,6 +2209,14 @@ nameCurrencyIT + + + + 20 + AccessService + -1 + + hasListName @@ -2348,6 +2383,14 @@ Invited Talk + + -1 + StorageService + + + + 20 + @@ -2385,6 +2428,14 @@ 5 + + + ProductionService + -1 + + + 20 + Academic Article @@ -2536,6 +2587,14 @@ 59 + + -1 + -1 + + + Biological Specimen + + School @@ -2601,10 +2660,10 @@ codeCurrency - realizesProtocol true - + realizesProtocol + credits @@ -2702,13 +2761,6 @@ - - ClinicalTrial - 1 - -1 - - - true @@ -3413,14 +3465,6 @@ - - -1 - - - 15 - - Protocol - countryArea @@ -3491,14 +3535,6 @@ codeAGROVOC - - Organism - - -1 - -1 - - - contributor contributor @@ -3527,12 +3563,12 @@ - - + -1 - - Human Study + Organism + + -1 @@ -3542,14 +3578,6 @@ -1 -1 - - -1 - Biological Specimen - -1 - - - - agriculturalAreaUnit @@ -3740,8 +3768,8 @@ - 20 study population count + 20 @@ -3865,14 +3893,6 @@ -1 - - AccessService - 20 - - -1 - - - @@ -3986,10 +4006,10 @@ - protocolRealizedBy - true + protocolRealizedBy + @@ -4141,14 +4161,6 @@ Outreach Provider Role - - - 10 - - Instrument - -1 - - Series @@ -4358,14 +4370,6 @@ true - - ResearchProject - -1 - - - -1 - - -1 Proceedings diff --git a/productMods/WEB-INF/submodels/scires-1.2.owl b/productMods/WEB-INF/submodels/scires-1.2.owl index 9858056b..36b87a36 100644 --- a/productMods/WEB-INF/submodels/scires-1.2.owl +++ b/productMods/WEB-INF/submodels/scires-1.2.owl @@ -13,42 +13,31 @@ xmlns:j.5="http://purl.org/dc/terms/" xmlns:xsd="http://www.w3.org/2001/XMLSchema#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > - - - + + - + + eagle-i: Material entity that is a portion or quantity of a biological material for use in testing, examination, or study. A biological specimen can be an individual animal, part of or derived an animal, plant, part of a plant, or microorganism. When a taxon is described, it is typically based on a single specimen and is referred to as the holotype. - - - - - - + An individual animal, part of or derived an animal, plant, part of a plant, or microorganism. + A portion or quantity of a biological material for use in testing, examination, or study. - number of human participants in the study (trial). - - - - An implement used to facilitate work, especially precision work. - An implement used to facilitate work, especially precision work. - - - - - A plan specification that allows different domain experts to reliably and independently reproduce a process. - A protocol is a plan specification which has sufficient level of detail and quantitative information to communicate it between domain experts, so that different domain experts will reliably be able to independently reproduce the process. - - + - - + + + + + + + A protocol is a plan specification which has sufficient level of detail and quantitative information to communicate it between domain experts, so that different domain experts will reliably be able to independently reproduce the process. + A plan specification that allows different domain experts to reliably and independently reproduce a process. @@ -59,95 +48,101 @@ Phase 4 Clinical Trial In Phase 4 trials, post marketing studies delineate additional information including the drug's or treatment's risks, benefits, and optimal use. - + - + + + + eagle-i: Research project that uses or collects measurements or assessments about humans. + Research project that uses or collects measurements or assessments about humans. + + - + Phase 2 Clinical Trial - + In Phase 2 trials, an experimental study drug or treatment is given to a larger group of people (100-300) to see if it is effective and to further evaluate its safety. - - An organism is a material entity that is an individual living system, such as animal, plant, bacteria or virus, that is capable of replicating or reproducing, growth and maintenance in the right environment. - OBI: An organism is material entity that is an individual living system, such as animal, plant, bacteria or virus, that is capable of replicating or reproducing, growth and maintenance in the right environment. An organism may be unicellular or made up, like humans, of many billions of cells divided into specialized tissues and organs. -NOTE that we are not addressing for now the issue of whether a foaf:Person is a subclass of obi:Organism - - - - A service that produces a physical object or data. - A service that produces a physical object or data, such as a custom micro-array chip, a made to order antibody, or a behavioral dataset + + ClinicalTrials.gov is an ICMJE-acceptable public registry, offering up-to-date information for locating clinical trials for a wide range of diseases and conditions. The U.S. National Institutes of Health (NIH), through its National Library of Medicine (NLM), developed this site in collaboration with the Food and Drug Administration (FDA), as a result of the FDA Modernization Act, which was passed into law in November 1997. - NCT00000419 - + + A service that produces a physical object or data, such as a custom micro-array chip, a made to order antibody, or a behavioral dataset + A service that produces a physical object or data. - - - - In Phase I trials, researchers test an experimental drug or treatment in a small group of people (20-80) for the first time to evaluate its safety, determine a safe dosage range, and identify side effects - Phase 1 Clinical Trial - - - - Research project that uses or collects measurements or assessments about humans. - - eagle-i: Research project that uses or collects measurements or assessments about humans. - - - - - Every clinical trial in the United States must be approved and monitored by an Institutional Review Board (IRB). An IRB is an independent committee of physicians, statisticians, community advocates and others whose objective is to ensure that a clinical trial is ethical and the rights of study participants are protected. - - - - A portion or quantity of a biological material for use in testing, examination, or study. - eagle-i: Material entity that is a portion or quantity of a biological material for use in testing, examination, or study. A biological specimen can be an individual animal, part of or derived an animal, plant, part of a plant, or microorganism. When a taxon is described, it is typically based on a single specimen and is referred to as the holotype. - An individual animal, part of or derived an animal, plant, part of a plant, or microorganism. - - - In Phase 3 trials, an experimental study drug or treatment is given to large groups of people (1,000-3,000) to confirm its effectiveness, monitor side effects, compare it to commonly used treatments, and collect information that will allow the experimental drug or treatment to be used safely. - - - - Phase 3 Clinical Trial - - + eagle-i: Material entity that is used in a chemical reaction or other experimental process to detect, measure, examine, or produce other substances. NOTE: For now we are not addressing whether this is a subclass of foaf:Agent Material entity that is used in a chemical reaction or other experimental process to detect, measure, examine, or produce other substances. - - + + + + + + + + In Phase I trials, researchers test an experimental drug or treatment in a small group of people (20-80) for the first time to evaluate its safety, determine a safe dosage range, and identify side effects + Phase 1 Clinical Trial + + + + An organism is a material entity that is an individual living system, such as animal, plant, bacteria or virus, that is capable of replicating or reproducing, growth and maintenance in the right environment. + OBI: An organism is material entity that is an individual living system, such as animal, plant, bacteria or virus, that is capable of replicating or reproducing, growth and maintenance in the right environment. An organism may be unicellular or made up, like humans, of many billions of cells divided into specialized tissues and organs. +NOTE that we are not addressing for now the issue of whether a foaf:Person is a subclass of obi:Organism + + + + A research study using human volunteers to answer specifc health-related questions. A clinical trial is a research study using human volunteers to answer questions about treatments for diseases and conditions. Clinical trials are conducted in phases. The trials at each phase have a different purpose and help scientists answer different questions. - A research study using human volunteers to answer specifc health-related questions. + + + + + Every clinical trial in the United States must be approved and monitored by an Institutional Review Board (IRB). An IRB is an independent committee of physicians, statisticians, community advocates and others whose objective is to ensure that a clinical trial is ethical and the rights of study participants are protected. + + + + + In Phase 3 trials, an experimental study drug or treatment is given to large groups of people (1,000-3,000) to confirm its effectiveness, monitor side effects, compare it to commonly used treatments, and collect information that will allow the experimental drug or treatment to be used safely. + + + Phase 3 Clinical Trial + + + + + An implement used to facilitate work, especially precision work. + + An implement used to facilitate work, especially precision work. - + Phase 0 is a recent designation for exploratory, first-in-human trials conducted in accordance with the United States Food and Drug Administration's (FDA) 2006 Guidance on Exploratory Investigational New Drug (IND) Studies. Phase 0 trials are also known as human microdosing studies and are designed to speed up the development of promising drugs or imaging agents by establishing very early on whether the drug or agent behaves in human subjects as was expected from preclinical studies. Phase 0 Clinical Trial @@ -156,10 +151,18 @@ NOTE: For now we are not addressing whether this is a subclass of foaf:Agent + + + + - - + + + + + + diff --git a/productMods/WEB-INF/submodels/vivo-core-1.2.owl b/productMods/WEB-INF/submodels/vivo-core-1.2.owl index a04efb10..cba8556e 100644 --- a/productMods/WEB-INF/submodels/vivo-core-1.2.owl +++ b/productMods/WEB-INF/submodels/vivo-core-1.2.owl @@ -25,6 +25,11 @@ A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available in PubMed Central. The PMCID is issued shortly after the PI or author approves the PubMed Central formatted web version of the submission. + + + + + http://purl.org/ontology/bibo/ Short Definition from bibo ontology @@ -55,25 +60,15 @@ - - - - - - 1 - + + - 1 - - - - - - + + @@ -85,15 +80,20 @@ + + + 1 + + - - + 1 + - - + + @@ -119,51 +119,51 @@ + UN Cartographic Section UN Cartographic Section - + + + + + - - + - + + + + + + + Accounting & Research Services Assistant; Director of Information Technology Staff, support, and other non-academic positions. - + + A position classified as professional, staff, support, or any other non-academic role - - - - 1 - - - - - - 2 - http://purl.org/ontology/bibo/ A sub property of identifier (http://en.wikipedia.org/wiki/SICI). @@ -174,18 +174,18 @@ - 1 - + 1 + - - + 1 + + + - - @@ -196,6 +196,11 @@ + + + + + Definition take from: http://en.wikipedia.org/wiki/Government_agency. United States Library of Congress @@ -210,6 +215,11 @@ Public description modified from the information on this page: http://www.w3.org/TR/2005/WD-swbp-skos-core-guide-20050510/#sechierarchy . + + + + + @@ -225,6 +235,11 @@ + + + + + FAO's geopolitical ontology version 1.1 was populated with FAO, UN and internationally recognized data sources. FAO DISCLAIMER: The designations employed and the presentation of material do not imply the expression of any opinion whatsoever on the part of the Food and Agriculture Organization of the United Nations concerning the legal status of any country, territory, city or area, or of its authorities, or concerning the delimitation of its frontiers or boundaries. @@ -239,20 +254,15 @@ - - - 1 - - Definition take from: http://xmlns.com/foaf/spec/#term_based_near . foaf indicates that the status of this term is "unstable". "The based_near relationship relates two "spatial things" (anything that can be somewhere), the latter typically described using the geo:lat / geo:long geo-positioning vocabulary (http://www.w3.org/2003/01/geo/wgs84_pos#). This allows us to say describe the typical latitute and longitude of, say, a Person (people are spatial things - they can be places) without implying that a precise location has been given." Used to link an agent, related to bibliographic things, to a place where it is based near: can be a city, a monument, a building, etc. - + - 1 - + + @@ -260,42 +270,27 @@ - - - The most general classification of a person - + The most general classification of a person + + + - - - - - - - - - - - 1 - - - - - - - - + + + + @@ -306,21 +301,36 @@ Starting page number within a continuous page range. stable + + + + + + + + + + - + - 1 - + + + + + + + @@ -330,25 +340,20 @@ http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - - - - - - - - - - - 1 - + + - - + + + + + + + @@ -359,6 +364,11 @@ Works prepared by hand including handwritten or typescript drafts of pre-publication papers or works not otherwise reproduced in multiple copies http://purl.org/ontology/bibo/ + + + + + @@ -375,11 +385,6 @@ - - - 1 - - Smaller administrative division into which a country may be divided. @@ -389,10 +394,7 @@ - - - @@ -405,8 +407,8 @@ - + @@ -416,20 +418,43 @@ - + - + + + + + + + + 1 + + + + + 1 + + + + + + + + + + 1 + @@ -461,11 +486,6 @@ http://www.fao.org/termportal/contr/fr/ FAO terminology - - - 1 - - 2010-06-24 @@ -486,6 +506,11 @@ + + + 1 + + @@ -493,6 +518,16 @@ + + + 1 + + + + + 1 + + @@ -507,11 +542,6 @@ http://purl.org/ontology/bibo/ something that is printed or published and distributed, esp. a given number of a periodical - - - - - @@ -536,6 +566,11 @@ http://www.fao.org/termportal/contr/es/ + + + + + @@ -559,6 +594,11 @@ http://faostat.fao.org/default.aspx?lang=es FAOSTAT http://faostat.fao.org + + + 1 + + @@ -569,16 +609,16 @@ - - - - - A short written piece focused on an event or announcement of note, having a defined publication time and of less enduring interest than a news feature. + + + 1 + + @@ -607,11 +647,16 @@ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.iso.org/iso/fr/country_codes/iso_3166_code_lists.htm + + + 1 + + + - Authorship of journal articles, books and other original works is a means by which academics communicate the results of their scholarly work, establish priority for their discoveries, and build their reputation among their peers. This class allows for linking an author to a publication while indicating information about that author's authorship. Contains the authors name, their rank in the publication, and whether or not they are a corresponding author on the publication. @@ -625,6 +670,21 @@ This class allows for linking an author to a publication while indicating inform Bibo Definition: A seminar, discussion group, or the like, that emphasizes exchange of ideas and the demonstration and application of techniques, skills, etc. + + + 1 + + + + + + + + + + + + @@ -644,11 +704,11 @@ This class allows for linking an author to a publication while indicating inform Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio + Independent organizations formally working together toward a common goal, under an expressed agreement - - + @@ -657,20 +717,15 @@ This class allows for linking an author to a publication while indicating inform - + - + A group of related documents issued at regular intervals. + http://purl.org/ontology/bibo/ - + stable - - - - - 1 - @@ -710,18 +765,13 @@ This class allows for linking an author to a publication while indicating inform 1 - + - - - - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/en/ @@ -767,20 +817,10 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - - - This is done through a restriction on academic degree to allow the values from to be foaf:organization to be used as the range. @@ -826,11 +866,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - A unit devoted primarily to extension activities, whether for outreach or research. @@ -857,14 +892,14 @@ This class allows for linking an author to a publication while indicating inform - - - + + + - + - - + 1 + @@ -881,10 +916,10 @@ This class allows for linking an author to a publication while indicating inform - - - + + + Something designed, built, installed, etc., to serve a specific function or activity affording a convenience or service. @@ -893,20 +928,20 @@ This class allows for linking an author to a publication while indicating inform Use subclasses of core:Facility subclasses instead of this class if possible - - - - - A gathering of people for a defined purpose, not necessarily public or announced - - - + + 1 + + + + + + @@ -948,11 +983,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/es/ - - - 1 - - @@ -970,11 +1000,6 @@ This class allows for linking an author to a publication while indicating inform Either city or town - a thickly populated area having fixed boundaries and certain local powers of government. - - - - - @@ -984,21 +1009,26 @@ This class allows for linking an author to a publication while indicating inform + That is a position held by an academic faculty member who works for administration. - - Associate Dean An academic administrative position (associate dean, etc.) as distinct from a professional administrative position (non-academic) + server; Bruker Vector-33 FT-IR - + A network server is one example. Medical schools and research laboratories can list professional equipment, such as microscopes. - + A physical object provided for specific purpose, task or occupation. - + + + + + 1 + @@ -1010,25 +1040,25 @@ This class allows for linking an author to a publication while indicating inform - + http://purl.org/ontology/bibo/ A specific journal article - + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a periodical or book - Short Definition modified from the bibo ontology. + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine. stable - Director of Admissions and Placement; Associate University Librarian - Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. + Director of Admissions and Placement; Associate University Librarian + + Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. An employment activity, whether compensated or not. Short definition comes from http://en.wikipedia.org/wiki/Position, and has been modified. - @@ -1050,21 +1080,11 @@ This class allows for linking an author to a publication while indicating inform The source of the public description and this info is found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html. Bibo considers this term "unstable". The bibo editorial note is: "We are not defining, using an enumeration, the range of the bibo:degree to the defined list of bibo:ThesisDegree. We won't do it because we want people to be able to define new degress if needed by some special usecases. Creating such an enumeration would restrict this to happen." - - - - - - An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials - - - - - + @@ -1078,15 +1098,15 @@ This class allows for linking an author to a publication while indicating inform + + + + + - - - - - Relates a document to an event; for example, a paper to a conference. @@ -1133,15 +1153,15 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + - + - 1 - + + @@ -1154,15 +1174,10 @@ This class allows for linking an author to a publication while indicating inform http://faostat.fao.org/DesktopDefault.aspx?PageID=550&lang=es#ancor 2009-09-21 - + - - - - - - - + + @@ -1170,13 +1185,13 @@ This class allows for linking an author to a publication while indicating inform US Patent Data; US Job Data A named collection of data, usually containing only one type of data - + - - + + - + Computer program and its related documentation; directs the operation of a computer @@ -1214,10 +1229,10 @@ This class allows for linking an author to a publication while indicating inform - - - + + + http://www.fao.org/termportal/contr/es/ @@ -1233,16 +1248,6 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 http://www.fao.org/termportal/contr/en/ - - - 1 - - - - - 1 - - My extension program consists of developing and reporting disease management strategies that are both economically and environmentally sound for fresh market vegetable production. We hope that some of this testing will result in practices adaptable for organic production. @@ -1275,26 +1280,41 @@ This class allows for linking an author to a publication while indicating inform An activity of an individual within his or her profession or institution; use outreach provider role for community service or other activities outside the profession. - - - 1 - - Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - 1 - - - + + + + + + + + + 1 + + + + + + + + + + 1 + + + + + 1 + + @@ -1313,36 +1333,31 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 FAO terminology - - - 1 - - - - - - - - - + + - stable - + A scholarly academic article, typically published in a journal. + http://purl.org/ontology/bibo/ Written by scholars for other scholars, typically published in an academic journal with an abstract and bibliography A specific academic journal article - + 1 - + + + + + 1 + @@ -1355,15 +1370,15 @@ This class allows for linking an author to a publication while indicating inform - + - - + + - + 1 - + @@ -1379,11 +1394,6 @@ This class allows for linking an author to a publication while indicating inform http://purl.org/ontology/bibo/ - - - - - http://www.un.org/Depts/Cartographic/english/htmain.htm http://www.un.org/Depts/Cartographic/english/htmain.htm @@ -1395,35 +1405,10 @@ This class allows for linking an author to a publication while indicating inform http://www.un.org/Depts/Cartographic/french/htmain.htm UN Cartographic Section - + - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1439,16 +1424,6 @@ This class allows for linking an author to a publication while indicating inform A summary of the resource. stable - - - - - - - - - - Role of a person designated by a grantee to direct a project or activity being supported by a grant, and who is accountable to the grantee for the proper conduct of the project or activity. Also known as Program Director or Project Director. @@ -1474,6 +1449,16 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/en/ + + + + + + + + 1 + + http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -1487,6 +1472,11 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/es/ + + + + + @@ -1509,13 +1499,18 @@ This class allows for linking an author to a publication while indicating inform + + + + + Definition taken from: http://en.wikipedia.org/wiki/University + University of Florida; Washington University in St. Louis An institution of higher education and research, which grants academic degrees in a variety of subjects, and provides both undergraduate education and postgraduate education. - @@ -1523,58 +1518,43 @@ This class allows for linking an author to a publication while indicating inform Definition from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html - - - - - - - - - - - - - - - - - - - - - - - - - Top level of all location classes. It's anticipated that the subclasses will be used when classifying items. And, all locations can be viewable via this class. Use subclasses of core:Location when classsifying items. - + - - - - - - - + + + A document created as a basis for discussion or a very early draft of a formal paper - - + + + + + + + + + + 1 + + + + + + @@ -1592,11 +1572,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - source: http://en.wikipedia.org/wiki/Issn @@ -1605,10 +1580,10 @@ This class allows for linking an author to a publication while indicating inform International Standard Serial Number - - - + + + @@ -1617,21 +1592,6 @@ This class allows for linking an author to a publication while indicating inform source of definition: http://www.uspto.gov/main/glossary/#p . The following site has patent number formats: http://www.uspto.gov/patents/ebc/kindcodesum.jsp . - - - - - - - - - - - - - - - @@ -1640,7 +1600,6 @@ This class allows for linking an author to a publication while indicating inform - http://purl.org/ontology/bibo/ @@ -1649,6 +1608,7 @@ This class allows for linking an author to a publication while indicating inform A periodical of scholarly journal Articles. Contains original scholarly research or review articles by experts in the field Journal of Information Science; IEEE Intelligent System; Scientometrics + http://purl.org/ontology/bibo/ @@ -1659,20 +1619,20 @@ This class allows for linking an author to a publication while indicating inform Contains news articles, opinions, features, advertising, and is usually issued daily or weekly - - + - + + - - - + + + - + - - + 1 + @@ -1696,20 +1656,20 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - - - - + - - + + + + + + + + + + + + @@ -1723,15 +1683,25 @@ This class allows for linking an author to a publication while indicating inform - + - + + + + + + + + + + + + Wiley Prize in Biomedical Sciences - An Award or Honor An Award or Honor @@ -1748,25 +1718,15 @@ This class allows for linking an author to a publication while indicating inform - + + - - + - + - - - - - - - - - - - - + 1 + @@ -1782,21 +1742,26 @@ This class allows for linking an author to a publication while indicating inform An agent that receives a communication document. + + + + + - + + + + + - - - + Only use if no specific subclasses of core:EventSeries desribe the activity. + A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. - - - - + + Two or more events that follow on one after the other or are connected one after the other. - - + @@ -1806,20 +1771,25 @@ This class allows for linking an author to a publication while indicating inform - + - 1 - + + - + + + 1 + + + + + - - @@ -1827,6 +1797,11 @@ This class allows for linking an author to a publication while indicating inform + + + 1 + + @@ -1840,21 +1815,26 @@ This class allows for linking an author to a publication while indicating inform use one freetextKeyword assertion for each keyword or phrase. - - - - - We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. + + + + + + + + 1 + + @@ -1862,39 +1842,54 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + + + + + + - Represents educational training that has been received. + This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree. - Currently any abstract name is given to individuals of this class. This could change in the future. + + + + + + - + A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue - + + + + + + - - - - - http://purl.org/ontology/bibo/ + Facebook; VIVOweb.org; Flickr A group of Webpages accessible on the Web. A group of webpages available within a specific parent address or URL on the World Wide Web - unstable @@ -1914,7 +1909,7 @@ We would like the range of core:outcome to be the union of Event and Process; an Work consisting of collections of previously published works - + Short Definition is the Medical Subject Heading (MeSH) definition A document that simultaneously contains other documents. http://purl.org/ontology/bibo/ @@ -1925,16 +1920,26 @@ We would like the range of core:outcome to be the union of Event and Process; an a reified relationship + + + + + - An area of corporate activity organized as an administrative or functional unit. Definition modified from http://www.thefreedictionary.com/division. It is difficult to tell the difference between a division and a department. Cardiovascular Medicine (division within medicine) + + + + + + The Ornithological Newsletter @@ -1942,10 +1947,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - + + + @@ -1955,9 +1960,9 @@ We would like the range of core:outcome to be the union of Event and Process; an VIVO Outreach Team; VIVO Ontology Team + An informal organization brought together for the purposes of a project or event. - @@ -1975,6 +1980,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + Definition take from: http://dictionary.reference.com/browse/hospital. Shands at the University of Florida @@ -1993,13 +2003,18 @@ We would like the range of core:outcome to be the union of Event and Process; an The academic degree of a Thesis - + Alchohol Education Center; Center for Arts and Public Policy; Hearing Research Center A place where a particular activity or service is concentrated. Short Definition take from http://www.thefreedictionary.com/center. + + + + + Country area, area of the country including area under inland water bodies, but excluding offshore territorial waters. Possible variations in the data may be due to updating and revisions of the country data and not necessarily to any change of area. Data are expressed in 1000 hectares. http://faostat.fao.org/site/375/default.aspx FAOSTAT @@ -2011,25 +2026,10 @@ We would like the range of core:outcome to be the union of Event and Process; an http://faostat.fao.org/site/377/default.aspx FAOSTAT http://faostat.fao.org/site/377/default.aspx - - - 1 - - Indicates the precision of the value of a DateTimeValue instance. - - - - - - - - - - For example an HR job title for a person might be - Assistant University Librarian, and the preferred job title for that same person could be - Physical Sciences Librarian. @@ -2038,14 +2038,14 @@ We would like the range of core:outcome to be the union of Event and Process; an + - Short Definition from OCLC Input Standards, EntW A document created to summarize research findings associated with the completion of an academic degree. stable + http://purl.org/ontology/bibo/ Works created to satisfy the requirements for an academic certification or degree; also called dissertation - @@ -2055,6 +2055,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + @@ -2076,11 +2081,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Only use if no specific subclasses of core:Role describe the role. - - + A person's or organization's type of contribution to an endeavor Only use this broad role class if no subclasses of role describe the item being classified. + @@ -2100,10 +2105,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + 1 - + + + + + + @@ -2124,10 +2134,10 @@ We would like the range of core:outcome to be the union of Event and Process; an UN Cartographic Section - A structured file of information or a set of logically related data stored and retrieved using computer-based means Short Definition is the Medical Subject Heading (MeSH) definition + PubMed @@ -2137,16 +2147,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - - - stable http://purl.org/ontology/bibo/ @@ -2156,7 +2156,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A meeting for consultation or discussion. - + @@ -2166,30 +2166,30 @@ We would like the range of core:outcome to be the union of Event and Process; an - + A distinct, usually ongoing and specialized unit within a large organization. Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division. Legal (department within a company); Use for any non-academic department - + - - + 1 + An online article or commentary appearing on a blog - A specific blog posting + + Collection of documents or information resources that have a unified identity stable - Collection of documents or information resources that have a unified identity. Archives, museums and libraries often acquire collections on specific subjects and from distinguished authors or researchers. Also includes collections of resources bundled into a license. http://purl.org/ontology/bibo/ Hill Ornithology Collection; Wiley Interscience Online Books Biochemisty Collection @@ -2205,6 +2205,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable + + + 1 + + A private company is one that is privately-owned, and thus, is not publicly-traded in the stock market. Members of the general public cannot purchase stock in a private company unless that company chooses to go public and become a public company. @@ -2212,6 +2217,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition obtained here: http://answers.ask.com/Business/Finance/what_is_a_private_company. Examples of private companies found here: http://www.forbes.com/2008/11/03/largest-private-companies-biz-privates08-cx_sr_1103private_land.html + + + + + @@ -2222,8 +2232,8 @@ We would like the range of core:outcome to be the union of Event and Process; an B.A. Bachelor of Arts This list may have multiple abbreviations for some degrees. An academic degree at any level, both as reported by individuals for employment and as offered by academic degree programs. - - + + @@ -2241,11 +2251,6 @@ We would like the range of core:outcome to be the union of Event and Process; an A legal document proposing or enacting a law or a group of laws. - - - 1 - - Minnesota; Michigan; Indiana; New York; Quebec; Manitoba; Ontario Source of the Short Definition: http://www.thefreedictionary.com/state. @@ -2268,6 +2273,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -2276,19 +2286,14 @@ We would like the range of core:outcome to be the union of Event and Process; an - + phonograph record; tape; CD; DVD; DAT An audio document; aka record. http://purl.org/ontology/bibo/ stable Recorded audio in any format - - - - - http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49chgef.htm @@ -2323,13 +2328,18 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ 2010-06-24 + + + + + http://purl.org/ontology/bibo/ film; video; Blu-ray Audiovisual recording in any format - + stable An audio-visual document; film, video, and so forth. @@ -2341,6 +2351,11 @@ We would like the range of core:outcome to be the union of Event and Process; an An area of land distinguished by its political autonomy. Politically independent territories. + + + + + Use subclasses of core:Geographic Region subclasses instead of this class if possible. @@ -2348,11 +2363,6 @@ We would like the range of core:outcome to be the union of Event and Process; an A location having coordinates in geographic space. - - - 1 - - Text of a speech written in preparation for delivery of the speech. @@ -2382,10 +2392,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + + @@ -2415,7 +2425,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A defined class of organizations that fund Grants. - + National Institute of Health (NIH) @@ -2428,24 +2438,19 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition found here: http://dictionary.reference.com/browse/publisher A person or company whose business is the publishing of books, periodicals, engravings, computer software, etc. + Elsevier; Harper & Row; Indiana University Press - + + + + 1 + - - - - - - - - 1 - - A student organization is an organization, operated by students at a university, whose membership normally consists only of students. Dancin' Gators @@ -2458,6 +2463,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Afghanistan; Antigua and Barbuda; Cameroon; Iceland; Jamaica; Nigeria; United States of America + + + + + @@ -2466,11 +2476,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - 2010-06-24 @@ -2493,11 +2498,16 @@ We would like the range of core:outcome to be the union of Event and Process; an The full URL. - Uniform Resource Locator (URL) specifies where an identified resource is available and the mechanism for retrieving it. + http://info.slis.indiana.edu/~katy/ + + + + + @@ -2524,11 +2534,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable - - - 1 - - http://www.fao.org/termportal/contr/ar/ @@ -2549,16 +2554,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - - - - - - Short Definition copied from bibo ontology @@ -2574,52 +2569,32 @@ We would like the range of core:outcome to be the union of Event and Process; an Public Definition source (http://www.answers.com/topic/publisher). - - - - - An Institute normally has a research focus but may also fulfill instructional or outreach roles. Institute for Fundamental Theory - + - 1 - + + + This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. Only use if no specific subclasses of foaf:organization desribe the organization. - A generic class encompassing several types of organizations. - - - - + + + + - - + + Ued to describe an organization related to bibliographic items such as a publishing company, etc. - - - - - - - - - - - - - - - http://www.fao.org/termportal/contr/fr/ http://www.fao.org/termportal/contr/es/ @@ -2639,6 +2614,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + 1 + + @@ -2652,57 +2632,27 @@ We would like the range of core:outcome to be the union of Event and Process; an definition modified from: source (http://en.wikipedia.org/wiki/Seating_capacity). 55 - - - - - - - - - - - - - - - The digital file (or physical equivalent), if available after the conference, vs. the act of attending/presenting: use ConferencePresentation for information about date/time/location/name of the event where the poster was presented - - - 1 - - An organized series of workshop events, whether repetitions of the same workshop or multiple different workshops. Use workshop for individual events. + + + + + - - - - - - - - - - - - 1 - - - @@ -2715,24 +2665,24 @@ We would like the range of core:outcome to be the union of Event and Process; an + - - Only use if no specific subclasses of event:Event are appropriate. - - - + + This class will also display instances of subclasses under Event, e.g. Philosophy Department Discussion Club; 2009 Racker Lecture; screening of a documentary. In addition to a location in space and time, an event may have any or all the following qualities: actively participating agents, passive factors, work products. Also, it may be in a virtual space or part of a series such as a lecture series. The previous short definition was: "An arbitrary classification of a space/time region, by a cognitive agent." - - - - - + + + + + + + Something that happens at a given place and time. - - + + @@ -2742,11 +2692,6 @@ The previous short definition was: "An arbitrary classification of a space/time http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - - - - - http://www.fao.org/termportal/en/ @@ -2766,10 +2711,10 @@ The previous short definition was: "An arbitrary classification of a space/time - - - + + + @@ -2777,6 +2722,16 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + + + + + + A visual representation such as a photograph or graph @@ -2801,22 +2756,12 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - - - - - - - + + An award, honor, or distinction received by a person on a particular date (not the award itself as given repeatedly, and not a grant award). - - + A specific award on a particular date or for a particular date range. Ninth annual Wiley Prize in Biomedical Sciences, for the discovery of a light activated ion channel @@ -2848,28 +2793,13 @@ The previous short definition was: "An arbitrary classification of a space/time Role of co-principal investigator of a grant, who devotes a specified percentage of time and is considered key personnel. - - - - - - - - - - - - - - - Professor, associate professor and assistant professor are common positions for academic faculty. + Professor; Associate Professor; Assistant Professor Academic position in a university or institution + - - @@ -2880,21 +2810,26 @@ The previous short definition was: "An arbitrary classification of a space/time http://en.wikipedia.org/wiki/Global_Trade_Item_Number. Global Trade Item Number 14 + + + + + The dual relationship of a professor advising a student and the student being advised by a professor, typically including start and end dates - + - + - + + - 1 - + @@ -2906,6 +2841,16 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + + + + + + @@ -2927,11 +2872,26 @@ modern society using the world of Star trek. Los Angeles Times, March An section number + + + 1 + + + + + + + + + + + + http://www.fao.org/termportal/contr/en/ http://www.fao.org/termportal/contr/es/ @@ -2950,11 +2910,6 @@ modern society using the world of Star trek. Los Angeles Times, March This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - - - http://purl.org/ontology/bibo/ @@ -2963,28 +2918,23 @@ modern society using the world of Star trek. Los Angeles Times, March An agent that interview another agent. - + + - 1 - - - - - - + + + + + + - - - 1 - - @@ -2997,15 +2947,15 @@ modern society using the world of Star trek. Los Angeles Times, March a specific period or duration, defined by (optional) start and end date/times. - + - - + 1 + - - - + + + @@ -3023,15 +2973,15 @@ modern society using the world of Star trek. Los Angeles Times, March Short Definition from bibo ontology - + - - + + - + 1 - + @@ -3056,12 +3006,32 @@ modern society using the world of Star trek. Los Angeles Times, March 2010-06-24 http://www.fao.org/termportal/contr/zh/ + + + + + The value of the datatype property *validSince* associated to a particular area (territory or group) indicates the area's first year of validity. The geopolitical ontology traces back historic changes only until 1985, therefore, if an area has a validSince = 1985, this indicates that the area is/was valid since 1985 or before. + + + + + + + + + + + + + 1 + + @@ -3074,6 +3044,16 @@ modern society using the world of Star trek. Los Angeles Times, March + + + 1 + + + + + + + @@ -3092,26 +3072,6 @@ source: http://en.wikipedia.org/wiki/ORCID . Public definition source: http://dublincore.org/2008/01/14/dcterms.rdf# . Examples of a Publisher include a person, an organization, or a service. Typically, the name of a Publisher should be used to indicate the entity. - - - 1 - - - - - - - - - - - - - - - - - FAO terminology http://www.fao.org/termportal/en/ @@ -3150,11 +3110,6 @@ Examples of a Publisher include a person, an organization, or a service. Typical A presentation of a series of slides, usually presented in front of an audience with written text and images. stable - - - 1 - - @@ -3187,6 +3142,26 @@ Examples of a Publisher include a person, an organization, or a service. Typical http://purl.org/ontology/bibo/ + + + 1 + + + + + + + + + + + + + + + + + http://www.fao.org/termportal/contr/es/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ @@ -3200,6 +3175,11 @@ Examples of a Publisher include a person, an organization, or a service. Typical 2010-06-24 + + + 1 + + @@ -3209,25 +3189,15 @@ Examples of a Publisher include a person, an organization, or a service. Typical A distinct, usually specialized educational unit within an educational organization. + - Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts) - + - 1 - - - - - - - - - - - + + @@ -3263,27 +3233,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/Critical or explanatory note for a Document. - - - - - - - - 1 - - - - + + + + An intramural or extramural award to support scholarly work, such as UF09179 (VIVO) Short definition is from the Glossary of NIH Terms. - - + Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity - @@ -3318,11 +3278,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Information Science; Computer Science; Anthropology - - - - - This namespace - http://purl.org/dc/elements/1.1/ - does not appear to have this element. @@ -3352,6 +3307,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/2010-06-24 http://www.fao.org/termportal/en/ + + + + + Universal Product Code @@ -3366,11 +3326,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3378,15 +3333,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/Intel Talent Search; poetry contest Not the same as an award or distinction. - - - + - - - - - + + @@ -3408,6 +3358,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + @@ -3424,10 +3379,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ 0.7 - - - + + + http://purl.org/ontology/bibo/ @@ -3442,22 +3397,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Address has properties for department name, street, city, state or province, postal code, and country. For US specific address, classify using core:US Postal Code. core:Address will display all addresses. + University of Waterloo, 200 University Avenue West, Waterloo, Ontario, Canada N2L 3G1 - A code and abstract concept expressing a location on the Earth's surface. To classify US specific addresses, use core:US Postal Code. - - - - - - Librarian; Library Systems Analyst; Music Bibliographer It is the common position in libraries. + A position held by library and information science professionals, or academic or technical experts, in support of providing information services or materials - + @@ -3473,6 +3423,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/es/ + + + + + + + + 1 + + @@ -3485,6 +3445,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + http://purl.org/ontology/bibo/ stable @@ -3493,16 +3458,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/Library of Congress Control Number Source: http://en.wikipedia.org/wiki/Library_of_Congress_Control_Number. - - - - - - - - - - @@ -3510,12 +3465,22 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + A group can also be an organization but need not be; typically used for looser associations of people or organizations acting together in some fashion, not necessarily through formal agreement or on a long-term basis. Added to the VIVO ontology to be able to support informal and perhaps even private groups of people around an idea, funding opportunity, or event. A group of agents + + + 1 + + http://purl.org/ontology/bibo/ unstable @@ -3524,24 +3489,19 @@ Definition source: http://isiwebofknowledge.com/researcherid/A chapter of a book. A main division of a book - - - 1 - - - - - - - Curriculum Steering Committee; PhD Advisory Committee A group of people organized for a specific purpose (e.g., a reporting or advisory role), often with a charge and for a specific duration. - + There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important. + + + + + Short Definition from OCLC Input Standards, EntW http://purl.org/ontology/bibo/ @@ -3574,14 +3534,19 @@ Definition source: http://isiwebofknowledge.com/researcherid/This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. + + + + + - + 1320 East 10th Street, Wells Library 021 Bloomington, IN 47405 + + Formal address in US postal address system. - - US postal address follow the format street, apt or office number (optional), city, state, and zipcode. @@ -3595,15 +3560,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - 1 - - - - - 1 - + + @@ -3618,15 +3578,20 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print. + + + + + - - - - + + Short Definition from the bibo ontology unstable A section of a book + + http://purl.org/ontology/bibo/ A section of a book. @@ -3642,6 +3607,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + + + + + A court associated with a legal document; for example, that which issues a decision. @@ -3656,6 +3631,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + radio or newspaper interview @@ -3672,6 +3652,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + + + + + Definition was take from here: http://dictionary.reference.com/browse/museum @@ -3679,11 +3669,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/The Getty Museum A building or place where works of art, scientific specimens, or other objects of permanent value are kept and displayed. - - - 1 - - unstable http://purl.org/ontology/bibo/ @@ -3692,11 +3677,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3716,6 +3696,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/fr/ + + + + + @@ -3732,10 +3717,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - + + + + + + + 1 + @@ -3749,16 +3739,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - 1 - - - - - - - @@ -3789,6 +3769,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/Not sure how to access the "Editor's Comments". But as North America is a continent, it would be placed directly into the continent subclass and viewable through this class along with any other subclass entities. Any region that goes beyond national boundaries and does not fit into any subclass of core:TransnationalRegion. + + + + + @@ -3808,15 +3793,20 @@ Definition source: http://isiwebofknowledge.com/researcherid/ B.A. + + + + + A person holding a position that is not considered to be an academic appointment. - - - + + + @@ -3830,10 +3820,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - 1 - + + @@ -3842,6 +3832,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + + + 1 + + A location having coordinates in geographic space. @@ -3849,16 +3849,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Use subclasses of core:Geographic Location subclasses instead of this class if possible. - - - - - - - - - - @@ -3878,16 +3868,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - - - - 1 - - @@ -3915,6 +3895,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/Used for a single narrative summary of research, typically covering a wide range of activities and time periods; use Researcher Role for information on individual activities + + + + + A role involving research (funded or unfunded), sometimes linked to a grant @@ -3931,20 +3916,20 @@ Definition source: http://isiwebofknowledge.com/researcherid/unstable - - - - - - + - 1 - + + + + + + + @@ -3955,11 +3940,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/Publication Description source http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . This term is also considered unstable. unstable - - - - - @@ -3971,13 +3951,18 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + + - An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support - - + + + + + + + 1 + @@ -4009,16 +3994,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - 1 - - - - - - - FAO terminology @@ -4032,6 +4007,11 @@ bibo has the domain of this property set to the union of Collection and Document 2010-06-24 + + + + + FAO terminology @@ -4045,10 +4025,30 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/ar/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + + + + + + + + + + + + + + + + 1 + + http://purl.org/ontology/bibo/ @@ -4057,35 +4057,25 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - - - - - - - - - - - - - - 1 - - + + + 1 + + + + + + + @@ -4097,11 +4087,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - @@ -4128,6 +4113,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + http://www.fao.org/termportal/contr/es/ @@ -4164,19 +4154,24 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + - - + A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate Short Definition from the bibo ontology - + stable + + + http://purl.org/ontology/bibo/ - - + A document (noun) is a bounded physical representation of body of information designed with the capacity (and usually intent) to communicate. A document may manifest symbolic, diagrammatic or sensory-representational information. - A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate @@ -4184,12 +4179,22 @@ bibo has the domain of this property set to the union of Collection and Document + + + + + + + + 1 + + FAO terminology 2010-06-24 @@ -4208,10 +4213,10 @@ bibo has the domain of this property set to the union of Collection and Document - - + - + 1 + @@ -4227,16 +4232,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - - - - - - FAO terminology http://www.fao.org/termportal/contr/ar/ @@ -4264,28 +4259,18 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - 1 - - - + An edited book. - http://purl.org/ontology/bibo/ - + + + Best American Science Writing 2009 stable An edited collection of stand-alone articles published as a book - - - - - - Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible. @@ -4300,6 +4285,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + + + + 1 + + 100 Caldwell Hall; 114 Martha Van Rensselaer (Rushmore Conference Room) Room that provides a particular service or is used for a particular activity. @@ -4307,49 +4302,64 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Enter room number of name. + + + 1 + + + + + + + + + + 1 + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - 1 - + + + + + + @@ -4357,16 +4367,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Medicine - - - - - - - - 1 - - http://www.fao.org/termportal/en/ http://www.fao.org/termportal/contr/ar/ @@ -4380,6 +4380,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://www.fao.org/termportal/contr/zh/ + + + 1 + + @@ -4392,10 +4397,15 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + 1 - + + + + + + @@ -4410,33 +4420,28 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi 2010-06-24 http://www.fao.org/termportal/contr/ar/ + + + 1 + + + College of Arts & Sciences; Ivy Tech Community College A primary academic unit within a University or a free-standing higher education organization without graduate degree programs. - + + + + + Document1 isVersionOf Document2 This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - - - - - - 1 - - - - - - - @@ -4461,6 +4466,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + + + + + + @@ -4468,6 +4483,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + http://purl.org/ontology/bibo/ Supreme Court Reporter @@ -4477,6 +4497,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Collection of legal cases stable + + + 1 + + + + + 1 + + http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/en/ @@ -4490,41 +4520,51 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - - - - - - 1 - - - - - + + + - + - + - - + + + + + + + + + + + + + + + 1 + + + + + 1 + + @@ -4533,11 +4573,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi UITS service + UITS service is the information technology services provided by Indiana University. SC. - - A regularly offered service in support of an academic, research, or administrative function (not personal or professional service by an individual) + @@ -4545,29 +4585,24 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - 1 - - - - - 1 - + + - - - - - + + + 1 + + Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. @@ -4580,11 +4615,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi The grounds of a school, college, university, or hospital. Or, a large, usually suburban, landscaped business or industrial site. - - - - - @@ -4600,23 +4630,28 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ Short Definition from the bibo ontology + + + + + - - - 1 - - This is done with a restriction on agent. - + + + 1 + + + @@ -4634,8 +4669,8 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + Used information from this definition: http://dictionary.reference.com/browse/library. - A collection of any materials, for study and enjoyment, which has been systematically arranged. Marston Science Library @@ -4653,30 +4688,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ - - - 1 - - - - - - - - - - - - - + - - - - - 1 - + http://www.fao.org/termportal/contr/ar/ @@ -4691,10 +4706,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - + - 1 - + + @@ -4714,6 +4729,21 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . + + + 1 + + + + + + + + + + + + @@ -4725,20 +4755,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi full email address - + 1 - - - - - - - - - - 1 - + @@ -4746,24 +4766,24 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - - - + + + + + + + 1 + Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. - - - + + + + - - - - - - - + @@ -4778,21 +4798,16 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + For data ingest from authoritative sources to record the actual way a person was listed as author, as potentially valuable information for author disambiguation. - - - - - - - - - - @@ -4815,24 +4830,24 @@ We would like the range of core:outcome to be the union of Event and Process; an http://aims.fao.org/website/Search-AGROVOC/sub http://aims.fao.org/website/Search-AGROVOC/sub - + 1 - + Used to link a bibliographic item to one of its contributor: can be an author, an editor, a publisher, etc. - + 1 - + - + + + - - @@ -4840,6 +4855,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -4856,21 +4876,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Any organization (likely also asserted as another class of Organization) with a primary, ongoing research function, not just through occasional roles - - - - - The result of rendering a work from one language to another - - - - - @@ -4882,6 +4892,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition http://en.wikipedia.org/wiki/Job_title#Job_title. + + + + + @@ -4901,17 +4916,17 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + - 1 - + Medical Subject Heading (MeSH) definition of Technical Report: Work consisting of a formal report giving details of the investigation and results of a medical or other scientific problem. When issued by a government agency or comparable official body, its contents may be classified, unclassified, or declassified with regard to security clearance. This publication type may also cover a scientific paper or article that records the current state or current position of scientific research and development. If so labeled by the editor or publisher, this publication type may be properly used for journal articles. A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc.. http://purl.org/ontology/bibo/ - + A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc. stable @@ -4947,35 +4962,30 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/fr/ - - - - - - - - - - - - - - + - - - + + + + + + + + + + + @@ -4986,15 +4996,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + + + - 1 - - - - - - @@ -5007,11 +5012,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - For individual, separate conferences, use conference instead. core:ConferenceSeries and core:SeminarSeries are very similar. @@ -5023,6 +5023,11 @@ We would like the range of core:outcome to be the union of Event and Process; an A person registered in an undergraduate program leading to a bachelor's degree or an undergraduate diploma or certificate. + + + + + An excerpted collection of words @@ -5032,25 +5037,25 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ Short Definition from the bibo ontology - - - - - - + A position involving academic work but without faculty status Researcher; Academic Extension Associate; Postdoctoral Associate - Those positions are held by people who do academic work but do not have faculty positions in universities or institutes. + + + 1 + + + Currently being used by a restriction on organization. @@ -5070,19 +5075,24 @@ We would like the range of core:outcome to be the union of Event and Process; an An outreach or community service role directed outside a person's primary profession and institution Communicating Astronomy to the Public - + - - + + 2 + + + + 1 + stable + A loose, thematic, collection of Documents, often Books. + A thematic collection of documents, usually books, issued at regular or irregular intervals http://purl.org/ontology/bibo/ - - Methods in Molecular Biology @@ -5092,6 +5102,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + Definition take from: http://dictionary.reference.com/browse/foundation. An institution financed by a donation or legacy to aid research, education, the arts, etc. @@ -5128,15 +5143,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - 1 - - - - - - + + @@ -5151,9 +5161,14 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet + + + + + - + Short Definition modified from the one found here: http://www.thefreedictionary.com/county. Alachua; Baker; Bradford; Kenora; Ottawa; Waterloo @@ -5182,41 +5197,36 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - - Short Definition from the bibo ontology - A distinct part of a larger document or collected document + http://purl.org/ontology/bibo/ a distinct part of a larger document or collected document. unstable - + + - + - - + + - + + - Short Definition copied from bibo ontology - - http://purl.org/ontology/bibo/ + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers. + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers - stable + @@ -5225,6 +5235,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + @@ -5234,26 +5249,36 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + + + + + + + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. + + + + - - - - An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. - - - An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. - - - + + + 1 + - + + + + + + 1 - + @@ -5261,16 +5286,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - 1 - - - - - 1 - - @@ -5282,6 +5297,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A URLLink that is designated (by the user or anyone else) as a primary link for the person, organization, event, etc. + + + + + @@ -5300,20 +5320,30 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Note: Bibo:editor is used as the inverse of core:editorOf. Public Description for bibo:editor was obtained from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - + + - - + + + + + + A postdoctoral training appointment (job) - + - - + 1 + + + + + + @@ -5337,11 +5367,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - @@ -5366,11 +5391,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - @@ -5378,6 +5398,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + @@ -5386,16 +5411,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - - - - - - The name defining a special edition of a document. Normally its a literal value composed of a version number and words. @@ -5416,16 +5431,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/termportal/en/ 2010-06-24 - - - 1 - - - - - - - @@ -5435,6 +5440,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + 1 + + 2010-04-01 UN Statistics Division http://unstats.un.org/unsd/methods/m49/m49alpha.htm @@ -5445,16 +5455,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49alpha.htm - - - - - - - - - - paraphrased editorial note from the bibo ontology: We are not defining, using an enumeration, the range of the bibo:status to be a defined list of bibo:DocumentStatus. This is because we want people to be able to define new statuses if needed; and creating such an enumeration would prevent this. @@ -5462,12 +5462,12 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - A list of items in a collection; an ordered compilation of item descriptions and sufficient information to afford access to them + NLM Catalog Short Definition is the Medical Subject Heading (MeSH) definition - + From 1a8cfc6b077d532fca12725629541f6aa038a73f Mon Sep 17 00:00:00 2001 From: sjm222 Date: Wed, 9 Feb 2011 18:07:56 +0000 Subject: [PATCH 387/427] missed the updated ontology name and prefix on the last check-in --- .../WEB-INF/filegraph/tbox/scires-1.2.owl | 10 +- .../WEB-INF/filegraph/tbox/vivo-core-1.2.owl | 2484 ++++++++--------- .../user/scires-1.2-annotations.rdf | 4 +- .../user/vivo-core-1.2-annotations.rdf | 6 +- productMods/WEB-INF/submodels/scires-1.2.owl | 10 +- .../WEB-INF/submodels/vivo-core-1.2.owl | 2484 ++++++++--------- 6 files changed, 2499 insertions(+), 2499 deletions(-) diff --git a/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl b/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl index 36b87a36..1988f3bd 100644 --- a/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl +++ b/productMods/WEB-INF/filegraph/tbox/scires-1.2.owl @@ -98,11 +98,6 @@ NOTE: For now we are not addressing whether this is a subclass of foaf:AgentMaterial entity that is used in a chemical reaction or other experimental process to detect, measure, examine, or produce other substances. - - - - - In Phase I trials, researchers test an experimental drug or treatment in a small group of people (20-80) for the first time to evaluate its safety, determine a safe dosage range, and identify side effects @@ -140,6 +135,11 @@ NOTE that we are not addressing for now the issue of whether a foaf:Person is a An implement used to facilitate work, especially precision work. + + + + + diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl index cba8556e..7da66c03 100644 --- a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl +++ b/productMods/WEB-INF/filegraph/tbox/vivo-core-1.2.owl @@ -19,17 +19,17 @@ xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsd="http://www.w3.org/2001/XMLSchema#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > + + + + + A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available in PubMed Central. The PMCID is issued shortly after the PI or author approves the PubMed Central formatted web version of the submission. - - - - - http://purl.org/ontology/bibo/ Short Definition from bibo ontology @@ -43,6 +43,11 @@ + + + 1 + + @@ -60,15 +65,10 @@ - - - - - - - + 1 + @@ -80,21 +80,6 @@ - - - 1 - - - - - 1 - - - - - - - unstable @@ -110,6 +95,11 @@ + + + + + @@ -118,17 +108,12 @@ - - + UN Cartographic Section UN Cartographic Section - - - - - - + + @@ -136,28 +121,28 @@ - + + + - - + + + + 1 + - - - - - Accounting & Research Services Assistant; Director of Information Technology Staff, support, and other non-academic positions. - - + A position classified as professional, staff, support, or any other non-academic role + @@ -172,20 +157,10 @@ Serial Item and Contribution Identifier - - - 1 - - - + 1 - - - - - - + @@ -196,11 +171,6 @@ - - - - - Definition take from: http://en.wikipedia.org/wiki/Government_agency. United States Library of Congress @@ -215,11 +185,6 @@ Public description modified from the information on this page: http://www.w3.org/TR/2005/WD-swbp-skos-core-guide-20050510/#sechierarchy . - - - - - @@ -235,11 +200,6 @@ - - - - - FAO's geopolitical ontology version 1.1 was populated with FAO, UN and internationally recognized data sources. FAO DISCLAIMER: The designations employed and the presentation of material do not imply the expression of any opinion whatsoever on the part of the Food and Agriculture Organization of the United Nations concerning the legal status of any country, territory, city or area, or of its authorities, or concerning the delimitation of its frontiers or boundaries. @@ -254,44 +214,39 @@ + + + 1 + + Definition take from: http://xmlns.com/foaf/spec/#term_based_near . foaf indicates that the status of this term is "unstable". "The based_near relationship relates two "spatial things" (anything that can be somewhere), the latter typically described using the geo:lat / geo:long geo-positioning vocabulary (http://www.w3.org/2003/01/geo/wgs84_pos#). This allows us to say describe the typical latitute and longitude of, say, a Person (people are spatial things - they can be places) without implying that a precise location has been given." Used to link an agent, related to bibliographic things, to a place where it is based near: can be a city, a monument, a building, etc. - - - - - Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - - - + + + + + The most general classification of a person - - + - - + + + - - - - - - - - + + + http://purl.org/ontology/bibo/ @@ -301,36 +256,21 @@ Starting page number within a continuous page range. stable - - - - - - - - - - - + - - - - - - - + 1 + @@ -340,21 +280,16 @@ http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - + + + 1 + + + - - - - - - - - - - stable @@ -364,11 +299,6 @@ Works prepared by hand including handwritten or typescript drafts of pre-publication papers or works not otherwise reproduced in multiple copies http://purl.org/ontology/bibo/ - - - - - @@ -385,6 +315,11 @@ + + + + + Smaller administrative division into which a country may be divided. @@ -394,8 +329,23 @@ + + + + + + + + + + + + + + + @@ -406,55 +356,25 @@ + + - + + - - - - - - - - - - - - - - - - - - - + - 1 - - - - - 1 - - - - - - - - - - 1 - + + @@ -468,6 +388,11 @@ + + + 1 + + @@ -499,6 +424,11 @@ http://www.fao.org/termportal/contr/es/ http://www.fao.org/termportal/contr/ar/ + + + + + @@ -506,11 +436,6 @@ - - - 1 - - @@ -518,21 +443,16 @@ - - - 1 - - - - - 1 - - Audiovisual recording in video format + + + + + Short Definition from the bibo ontology @@ -545,6 +465,11 @@ + + + + + @@ -566,14 +491,14 @@ http://www.fao.org/termportal/contr/es/ - - - - - + + + + + UN Statistics Division http://unstats.un.org/unsd/methods/m49/m49alpha.htm @@ -584,6 +509,16 @@ UN Statistics Division + + + + + + + + + + http://faostat.fao.org http://faostat.fao.org @@ -594,10 +529,10 @@ http://faostat.fao.org/default.aspx?lang=es FAOSTAT http://faostat.fao.org - + - 1 - + 1 + @@ -609,16 +544,21 @@ + + + + + + + + + + A short written piece focused on an event or announcement of note, having a defined publication time and of less enduring interest than a news feature. - - - 1 - - @@ -647,19 +587,14 @@ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.iso.org/iso/fr/country_codes/iso_3166_code_lists.htm - - - 1 - - - Authorship of journal articles, books and other original works is a means by which academics communicate the results of their scholarly work, establish priority for their discoveries, and build their reputation among their peers. This class allows for linking an author to a publication while indicating information about that author's authorship. Contains the authors name, their rank in the publication, and whether or not they are a corresponding author on the publication. + Currently any abstract name is given to members of this class. This could change in the future. @@ -670,20 +605,10 @@ This class allows for linking an author to a publication while indicating inform Bibo Definition: A seminar, discussion group, or the like, that emphasizes exchange of ideas and the demonstration and application of techniques, skills, etc. - + 1 - - - - - - - - - - - + @@ -704,11 +629,11 @@ This class allows for linking an author to a publication while indicating inform Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio - Independent organizations formally working together toward a common goal, under an expressed agreement + + - @@ -717,13 +642,13 @@ This class allows for linking an author to a publication while indicating inform - - + + + A group of related documents issued at regular intervals. - http://purl.org/ontology/bibo/ - + stable @@ -762,16 +687,26 @@ This class allows for linking an author to a publication while indicating inform Short Definition take from http://en.wiktionary.org/wiki/continent. - - - 1 - - + + + + + + + + + + + + + + + http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/en/ @@ -877,6 +812,16 @@ This class allows for linking an author to a publication while indicating inform Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . + + + + + + + + + 2 + FAO terminology @@ -892,14 +837,19 @@ This class allows for linking an author to a publication while indicating inform - - - + + + - + - 1 - + + + + + + + @@ -916,10 +866,10 @@ This class allows for linking an author to a publication while indicating inform - + - - + 1 + Something designed, built, installed, etc., to serve a specific function or activity affording a convenience or service. @@ -933,15 +883,15 @@ This class allows for linking an author to a publication while indicating inform - + 1 - + - + + + - - @@ -950,6 +900,16 @@ This class allows for linking an author to a publication while indicating inform Regularly updated online journal or newsletter by one or more writers, called bloggers, containing articles and commentary of interest to the blogger + + + 1 + + + + + + + @@ -958,6 +918,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + @@ -1000,6 +965,21 @@ This class allows for linking an author to a publication while indicating inform Either city or town - a thickly populated area having fixed boundaries and certain local powers of government. + + + 1 + + + + + + + + + + 1 + + @@ -1009,26 +989,26 @@ This class allows for linking an author to a publication while indicating inform - That is a position held by an academic faculty member who works for administration. Associate Dean + + An academic administrative position (associate dean, etc.) as distinct from a professional administrative position (non-academic) - server; Bruker Vector-33 FT-IR - A network server is one example. Medical schools and research laboratories can list professional equipment, such as microscopes. - + A physical object provided for specific purpose, task or occupation. - + + - + + - 1 - + @@ -1040,21 +1020,21 @@ This class allows for linking an author to a publication while indicating inform - http://purl.org/ontology/bibo/ A specific journal article - + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a periodical or book + Short Definition modified from the bibo ontology. - + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine. stable - + + Director of Admissions and Placement; Associate University Librarian - Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. An employment activity, whether compensated or not. Short definition comes from http://en.wikipedia.org/wiki/Position, and has been modified. @@ -1070,6 +1050,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + The thesis degree. @@ -1084,7 +1069,7 @@ This class allows for linking an author to a publication while indicating inform An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials - + @@ -1098,15 +1083,15 @@ This class allows for linking an author to a publication while indicating inform - - - - - + + + + + Relates a document to an event; for example, a paper to a conference. @@ -1118,6 +1103,11 @@ This class allows for linking an author to a publication while indicating inform unstable + + + + + Agricultural area, this category is the sum of areas under a) arable land - land under temporary agricultural crops (multiple-cropped areas are counted only once), temporary meadows for mowing or pasture, land under market and kitchen gardens and land temporarily fallow (less than five years). The abandoned land resulting from shifting cultivation is not included in this category. Data for “Arable land” are not meant to indicate the amount of land that is potentially cultivable; (b) permanent crops - land cultivated with long-term crops which do not have to be replanted for several years (such as cocoa and coffee); land under trees and shrubs producing flowers, such as roses and jasmine; and nurseries (except those for forest trees, which should be classified under "forest"); and (c) permanent meadows and pastures - land used permanently (five years or more) to grow herbaceous forage crops, either cultivated or growing wild (wild prairie or grazing land). Data are expressed in 1000 hectares. http://faostat.fao.org/site/375/default.aspx @@ -1147,6 +1137,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + Use for teaching roles other than specific for-credit courses within a person's home institution. Use for teaching experiences other than specific for-credit courses within a person's home institution. @@ -1155,13 +1150,8 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - + 1 + @@ -1174,28 +1164,28 @@ This class allows for linking an author to a publication while indicating inform http://faostat.fao.org/DesktopDefault.aspx?PageID=550&lang=es#ancor 2009-09-21 - - - - - US Patent Data; US Job Data A named collection of data, usually containing only one type of data - + - - + + - + Computer program and its related documentation; directs the operation of a computer + + + + + An agreement involving specific deliverables and payment @@ -1218,6 +1208,11 @@ This class allows for linking an author to a publication while indicating inform unstable A written argument submitted to a court. + + + + + A date and/or time @@ -1229,11 +1224,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - http://www.fao.org/termportal/contr/es/ @@ -1274,6 +1264,11 @@ This class allows for linking an author to a publication while indicating inform 020530902X + + + 1 + + Member of the International Conference on Complex Systems Organizing Committee @@ -1285,41 +1280,31 @@ This class allows for linking an author to a publication while indicating inform Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - - - - - - - - - - 1 - - - - - - - - 1 - + - 1 - + 1 + A person working in a position of librarian or information professional, or academic or technical expert in support of providing information services or materials. + + + + + + + + + + http://www.fao.org/termportal/contr/zh/ @@ -1333,32 +1318,22 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 FAO terminology - + - - + 1 + stable - + + A scholarly academic article, typically published in a journal. - http://purl.org/ontology/bibo/ Written by scholars for other scholars, typically published in an academic journal with an abstract and bibliography A specific academic journal article - - - 1 - - - - - 1 - - @@ -1370,15 +1345,30 @@ This class allows for linking an author to a publication while indicating inform - + - - + 1 + - + + + + + + + + + + + 1 - + + + + + + @@ -1405,10 +1395,10 @@ This class allows for linking an author to a publication while indicating inform http://www.un.org/Depts/Cartographic/french/htmain.htm UN Cartographic Section - + - - + 1 + @@ -1429,6 +1419,11 @@ This class allows for linking an author to a publication while indicating inform Role of a person designated by a grantee to direct a project or activity being supported by a grant, and who is accountable to the grantee for the proper conduct of the project or activity. Also known as Program Director or Project Director. + + + + + Definition take from here: http://dictionary.reference.com/browse/school. @@ -1449,16 +1444,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/en/ - - - - - - - - 1 - - http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -1472,11 +1457,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/es/ - - - - - @@ -1488,6 +1468,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + @@ -1499,18 +1484,18 @@ This class allows for linking an author to a publication while indicating inform - - - - - Definition taken from: http://en.wikipedia.org/wiki/University - University of Florida; Washington University in St. Louis An institution of higher education and research, which grants academic degrees in a variety of subjects, and provides both undergraduate education and postgraduate education. + + + + + + @@ -1524,35 +1509,30 @@ This class allows for linking an author to a publication while indicating inform It's anticipated that the subclasses will be used when classifying items. And, all locations can be viewable via this class. Use subclasses of core:Location when classsifying items. - + - - + 1 + - A document created as a basis for discussion or a very early draft of a formal paper - + + - - - - - - 1 - + 1 + - - + + @@ -1580,11 +1560,6 @@ This class allows for linking an author to a publication while indicating inform International Standard Serial Number - - - - - @@ -1592,6 +1567,16 @@ This class allows for linking an author to a publication while indicating inform source of definition: http://www.uspto.gov/main/glossary/#p . The following site has patent number formats: http://www.uspto.gov/patents/ebc/kindcodesum.jsp . + + + + + + + + + + @@ -1600,6 +1585,7 @@ This class allows for linking an author to a publication while indicating inform + http://purl.org/ontology/bibo/ @@ -1608,7 +1594,6 @@ This class allows for linking an author to a publication while indicating inform A periodical of scholarly journal Articles. Contains original scholarly research or review articles by experts in the field Journal of Information Science; IEEE Intelligent System; Scientometrics - http://purl.org/ontology/bibo/ @@ -1619,20 +1604,15 @@ This class allows for linking an author to a publication while indicating inform Contains news articles, opinions, features, advertising, and is usually issued daily or weekly - - - - - - - - - - - + 1 - + + + + + 1 + @@ -1656,20 +1636,15 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - - - + + + + + @@ -1683,28 +1658,23 @@ This class allows for linking an author to a publication while indicating inform - + - - - - - - - - - - - - + 1 + - Wiley Prize in Biomedical Sciences + An Award or Honor An Award or Honor + + + + + @@ -1718,15 +1688,10 @@ This class allows for linking an author to a publication while indicating inform - - - - - - + 1 - + @@ -1742,26 +1707,21 @@ This class allows for linking an author to a publication while indicating inform An agent that receives a communication document. - - - - - - - - + Only use if no specific subclasses of core:EventSeries desribe the activity. - A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. - + A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. + + Two or more events that follow on one after the other or are connected one after the other. - + + @@ -1771,37 +1731,17 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - 1 - - - - - - - - - - 1 - - @@ -1821,20 +1761,20 @@ use one freetextKeyword assertion for each keyword or phrase. We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - + - - + + + + + + 1 + - - - 1 - - @@ -1842,40 +1782,25 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - - - - - - + Represents educational training that has been received. - + This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree. Currently any abstract name is given to individuals of this class. This could change in the future. - - - - - - - + A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue - + - + - - + 1 + @@ -1884,7 +1809,7 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ - + Facebook; VIVOweb.org; Flickr A group of Webpages accessible on the Web. A group of webpages available within a specific parent address or URL on the World Wide Web @@ -1909,37 +1834,27 @@ We would like the range of core:outcome to be the union of Event and Process; an Work consisting of collections of previously published works - Short Definition is the Medical Subject Heading (MeSH) definition A document that simultaneously contains other documents. http://purl.org/ontology/bibo/ stable + functions as an n-ary predicate a reified relationship - - - - - + An area of corporate activity organized as an administrative or functional unit. Definition modified from http://www.thefreedictionary.com/division. It is difficult to tell the difference between a division and a department. Cardiovascular Medicine (division within medicine) - - - - - - The Ornithological Newsletter @@ -1947,11 +1862,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - @@ -1960,7 +1870,7 @@ We would like the range of core:outcome to be the union of Event and Process; an VIVO Outreach Team; VIVO Ontology Team - + An informal organization brought together for the purposes of a project or event. @@ -1980,10 +1890,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + 1 + Definition take from: http://dictionary.reference.com/browse/hospital. @@ -2003,18 +1913,13 @@ We would like the range of core:outcome to be the union of Event and Process; an The academic degree of a Thesis - + Alchohol Education Center; Center for Arts and Public Policy; Hearing Research Center A place where a particular activity or service is concentrated. Short Definition take from http://www.thefreedictionary.com/center. - - - - - Country area, area of the country including area under inland water bodies, but excluding offshore territorial waters. Possible variations in the data may be due to updating and revisions of the country data and not necessarily to any change of area. Data are expressed in 1000 hectares. http://faostat.fao.org/site/375/default.aspx FAOSTAT @@ -2030,6 +1935,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Indicates the precision of the value of a DateTimeValue instance. + + + + + For example an HR job title for a person might be - Assistant University Librarian, and the preferred job title for that same person could be - Physical Sciences Librarian. @@ -2038,15 +1948,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - Short Definition from OCLC Input Standards, EntW A document created to summarize research findings associated with the completion of an academic degree. stable - http://purl.org/ontology/bibo/ Works created to satisfy the requirements for an academic certification or degree; also called dissertation + + @@ -2055,11 +1965,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - @@ -2081,11 +1986,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Only use if no specific subclasses of core:Role describe the role. + - + A person's or organization's type of contribution to an endeavor Only use this broad role class if no subclasses of role describe the item being classified. - @@ -2105,15 +2010,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + 1 - + - - - + + + @@ -2137,7 +2042,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A structured file of information or a set of logically related data stored and retrieved using computer-based means Short Definition is the Medical Subject Heading (MeSH) definition - + PubMed @@ -2156,7 +2061,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A meeting for consultation or discussion. - + @@ -2166,27 +2071,37 @@ We would like the range of core:outcome to be the union of Event and Process; an - + A distinct, usually ongoing and specialized unit within a large organization. Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division. Legal (department within a company); Use for any non-academic department - + + + + + + 1 - + + + + + + An online article or commentary appearing on a blog + A specific blog posting - - + Collection of documents or information resources that have a unified identity stable @@ -2205,11 +2120,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable - - - 1 - - A private company is one that is privately-owned, and thus, is not publicly-traded in the stock market. Members of the general public cannot purchase stock in a private company unless that company chooses to go public and become a public company. @@ -2217,10 +2127,10 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition obtained here: http://answers.ask.com/Business/Finance/what_is_a_private_company. Examples of private companies found here: http://www.forbes.com/2008/11/03/largest-private-companies-biz-privates08-cx_sr_1103private_land.html - + - - + + @@ -2231,9 +2141,9 @@ We would like the range of core:outcome to be the union of Event and Process; an B.A. Bachelor of Arts This list may have multiple abbreviations for some degrees. + An academic degree at any level, both as reported by individuals for employment and as offered by academic degree programs. - - + @@ -2273,11 +2183,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - @@ -2285,9 +2190,9 @@ We would like the range of core:outcome to be the union of Event and Process; an + - phonograph record; tape; CD; DVD; DAT An audio document; aka record. http://purl.org/ontology/bibo/ @@ -2315,6 +2220,21 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ + + + + + + + 1 + + + + + + + + FAO terminology @@ -2328,18 +2248,13 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ 2010-06-24 - - - - - http://purl.org/ontology/bibo/ film; video; Blu-ray Audiovisual recording in any format + - stable An audio-visual document; film, video, and so forth. @@ -2351,11 +2266,6 @@ We would like the range of core:outcome to be the union of Event and Process; an An area of land distinguished by its political autonomy. Politically independent territories. - - - - - Use subclasses of core:Geographic Region subclasses instead of this class if possible. @@ -2392,11 +2302,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - UN cartographic maps (http://www.un.org/Depts/Cartographic/map/profile/world.pdf) @@ -2424,12 +2329,22 @@ We would like the range of core:outcome to be the union of Event and Process; an + A defined class of organizations that fund Grants. - National Institute of Health (NIH) + + + + + + + + + + @@ -2438,13 +2353,18 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition found here: http://dictionary.reference.com/browse/publisher A person or company whose business is the publishing of books, periodicals, engravings, computer software, etc. - Elsevier; Harper & Row; Indiana University Press + - + + - 1 - + + + + + + @@ -2463,11 +2383,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Afghanistan; Antigua and Barbuda; Cameroon; Iceland; Jamaica; Nigeria; United States of America - - - - - @@ -2476,6 +2391,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + 2010-06-24 @@ -2489,6 +2409,16 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/fr/ + + + + + + + + + + @@ -2497,17 +2427,12 @@ We would like the range of core:outcome to be the union of Event and Process; an + The full URL. Uniform Resource Locator (URL) specifies where an identified resource is available and the mechanism for retrieving it. - http://info.slis.indiana.edu/~katy/ - - - - - @@ -2522,6 +2447,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -2534,6 +2464,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable + + + + + http://www.fao.org/termportal/contr/ar/ @@ -2554,6 +2489,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + Short Definition copied from bibo ontology @@ -2569,30 +2509,30 @@ We would like the range of core:outcome to be the union of Event and Process; an Public Definition source (http://www.answers.com/topic/publisher). + + + + + An Institute normally has a research focus but may also fulfill instructional or outreach roles. Institute for Fundamental Theory - - - - - - This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. - Only use if no specific subclasses of foaf:organization desribe the organization. - A generic class encompassing several types of organizations. - + + Only use if no specific subclasses of foaf:organization desribe the organization. - + + A generic class encompassing several types of organizations. + + - Ued to describe an organization related to bibliographic items such as a publishing company, etc. @@ -2608,22 +2548,42 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + + + - + 1 - + + + + + + + + + + 1 + A Person holding an academic employment appointment focused on research rather than teaching; temporary (or for some defined term) + + + 1 + + @@ -2632,6 +2592,16 @@ We would like the range of core:outcome to be the union of Event and Process; an definition modified from: source (http://en.wikipedia.org/wiki/Seating_capacity). 55 + + + + + + + + + + @@ -2643,16 +2613,21 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + 1 + + + + + + @@ -2664,25 +2639,50 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + + + + + + - + + Only use if no specific subclasses of event:Event are appropriate. - - + This class will also display instances of subclasses under Event, e.g. Philosophy Department Discussion Club; 2009 Racker Lecture; screening of a documentary. In addition to a location in space and time, an event may have any or all the following qualities: actively participating agents, passive factors, work products. Also, it may be in a virtual space or part of a series such as a lecture series. The previous short definition was: "An arbitrary classification of a space/time region, by a cognitive agent." - - - - - - - + + + + + + Something that happens at a given place and time. - - + + + + + + + + + + + + + + + + + + @@ -2711,27 +2711,12 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - - - - - - - - - - - A visual representation such as a photograph or graph @@ -2750,19 +2735,29 @@ The previous short definition was: "An arbitrary classification of a space/time + + + 1 + + + + + + + - - An award, honor, or distinction received by a person on a particular date (not the award itself as given repeatedly, and not a grant award). - A specific award on a particular date or for a particular date range. + + + Ninth annual Wiley Prize in Biomedical Sciences, for the discovery of a light activated ion channel @@ -2772,6 +2767,11 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + Short Definition from the bibo ontology http://purl.org/ontology/bibo/ @@ -2781,6 +2781,16 @@ The previous short definition was: "An arbitrary classification of a space/time Draft legislation presented for discussion to a legal body. stable + + + + + + + + + + @@ -2795,10 +2805,10 @@ The previous short definition was: "An arbitrary classification of a space/time Professor, associate professor and assistant professor are common positions for academic faculty. - Professor; Associate Professor; Assistant Professor Academic position in a university or institution - + + @@ -2810,26 +2820,21 @@ The previous short definition was: "An arbitrary classification of a space/time http://en.wikipedia.org/wiki/Global_Trade_Item_Number. Global Trade Item Number 14 - - - - - The dual relationship of a professor advising a student and the student being advised by a professor, typically including start and end dates - + - + + + - - - - + + + - @@ -2841,15 +2846,10 @@ The previous short definition was: "An arbitrary classification of a space/time - + - - - - - - - + 1 + @@ -2872,25 +2872,20 @@ modern society using the world of Star trek. Los Angeles Times, March An section number - + - 1 - + 1 + - + - - - - - - - + 1 + http://www.fao.org/termportal/contr/en/ @@ -2905,6 +2900,11 @@ modern society using the world of Star trek. Los Angeles Times, March http://www.fao.org/termportal/en/ 2010-06-24 + + + + + Used to relate a reference citation to a bibliographic resource. @@ -2918,20 +2918,15 @@ modern society using the world of Star trek. Los Angeles Times, March An agent that interview another agent. - - + + + - - - - - - @@ -2943,19 +2938,24 @@ modern society using the world of Star trek. Los Angeles Times, March http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet + + + + + a specific period or duration, defined by (optional) start and end date/times. - + + + 1 + + + 1 - - - - - - + @@ -2973,21 +2973,26 @@ modern society using the world of Star trek. Los Angeles Times, March Short Definition from bibo ontology - - - - - - + 1 - + + + + + + Written script for a film production, including dialogue and descriptions of gestures, actions, shooting directions + + + + + @@ -3006,31 +3011,21 @@ modern society using the world of Star trek. Los Angeles Times, March 2010-06-24 http://www.fao.org/termportal/contr/zh/ - - - - - The value of the datatype property *validSince* associated to a particular area (territory or group) indicates the area's first year of validity. The geopolitical ontology traces back historic changes only until 1985, therefore, if an area has a validSince = 1985, this indicates that the area is/was valid since 1985 or before. - + - - + + - - - - - - + 1 - + @@ -3044,15 +3039,15 @@ modern society using the world of Star trek. Los Angeles Times, March - + - 1 - + + - + - - + + @@ -3142,25 +3137,15 @@ Examples of a Publisher include a person, an organization, or a service. Typical http://purl.org/ontology/bibo/ - + - 1 - + + - - - + - - - - - - - - - - + + http://www.fao.org/termportal/contr/es/ @@ -3175,29 +3160,34 @@ Examples of a Publisher include a person, an organization, or a service. Typical 2010-06-24 - - - 1 - - Resource dependent on other entities This class is here so it can be equivalent to vitro:DependentResource. Deletion in the VIVO system behaves differently when deleting members of this class: related individuals may need to be deleted as well. + + + + + + + + 1 + + A distinct, usually specialized educational unit within an educational organization. - - + + Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts) - + - - + + @@ -3234,16 +3224,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + - - - + + An intramural or extramural award to support scholarly work, such as UF09179 (VIVO) Short definition is from the Glossary of NIH Terms. - Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity + @@ -3272,6 +3262,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/A legal decision that reverses a ruling. http://purl.org/ontology/bibo/ + + + + + @@ -3307,11 +3302,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/2010-06-24 http://www.fao.org/termportal/en/ - - - - - Universal Product Code @@ -3333,11 +3323,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/Intel Talent Search; poetry contest Not the same as an award or distinction. - - - - - @@ -3358,11 +3343,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3379,11 +3359,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ 0.7 - - - - - http://purl.org/ontology/bibo/ New Yorker @@ -3397,17 +3372,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Address has properties for department name, street, city, state or province, postal code, and country. For US specific address, classify using core:US Postal Code. core:Address will display all addresses. - University of Waterloo, 200 University Avenue West, Waterloo, Ontario, Canada N2L 3G1 + A code and abstract concept expressing a location on the Earth's surface. To classify US specific addresses, use core:US Postal Code. Librarian; Library Systems Analyst; Music Bibliographer It is the common position in libraries. - A position held by library and information science professionals, or academic or technical experts, in support of providing information services or materials - + + @@ -3423,15 +3398,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/es/ - - - - - - + 1 - + @@ -3445,11 +3415,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - http://purl.org/ontology/bibo/ stable @@ -3465,22 +3430,12 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - A group can also be an organization but need not be; typically used for looser associations of people or organizations acting together in some fashion, not necessarily through formal agreement or on a long-term basis. Added to the VIVO ontology to be able to support informal and perhaps even private groups of people around an idea, funding opportunity, or event. A group of agents - - - 1 - - http://purl.org/ontology/bibo/ unstable @@ -3492,16 +3447,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Curriculum Steering Committee; PhD Advisory Committee + A group of people organized for a specific purpose (e.g., a reporting or advisory role), often with a charge and for a specific duration. - There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important. - - - - - Short Definition from OCLC Input Standards, EntW http://purl.org/ontology/bibo/ @@ -3530,23 +3480,28 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + + + + + + This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - - - - + 1320 East 10th Street, Wells Library 021 Bloomington, IN 47405 - - Formal address in US postal address system. + + US postal address follow the format street, apt or office number (optional), city, state, and zipcode. @@ -3556,15 +3511,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + - - - - - @@ -3578,22 +3533,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print. - - - - - - - + Short Definition from the bibo ontology + unstable A section of a book - - + http://purl.org/ontology/bibo/ + A section of a book. @@ -3607,15 +3557,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - + 1 + - + - - + + @@ -3631,11 +3581,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - radio or newspaper interview @@ -3645,6 +3590,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable + + + + + @@ -3652,16 +3602,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - - - - - - Definition was take from here: http://dictionary.reference.com/browse/museum @@ -3696,36 +3636,41 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/fr/ - - - - - + + + + + + + + + + + + + + + - + - - - - - - 1 - + + @@ -3769,11 +3714,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/Not sure how to access the "Editor's Comments". But as North America is a continent, it would be placed directly into the continent subclass and viewable through this class along with any other subclass entities. Any region that goes beyond national boundaries and does not fit into any subclass of core:TransnationalRegion. - - - - - @@ -3781,29 +3721,49 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + + + + + + + + + + + + + + + A short form for an longer title or name. B.A. - + - - + + A person holding a position that is not considered to be an academic appointment. - + @@ -3820,10 +3780,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - + + + + + + 1 + @@ -3832,16 +3797,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - - - - 1 - - A location having coordinates in geographic space. @@ -3889,16 +3844,21 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + Used for a single narrative summary of research, typically covering a wide range of activities and time periods; use Researcher Role for information on individual activities - + - - + + A role involving research (funded or unfunded), sometimes linked to a grant @@ -3907,6 +3867,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Bacteria-resistant bandage; Termite prevention system; Hurricane resistant houses + + + + + Relates a document to some transcribed original. The bibo:transcriptOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers this term unstable. @@ -3916,20 +3881,20 @@ Definition source: http://isiwebofknowledge.com/researcherid/unstable + + + + + - + - - - - - - - + 1 + @@ -3951,18 +3916,13 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + + An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support - - - - - - - 1 - + + + @@ -4007,11 +3967,6 @@ bibo has the domain of this property set to the union of Collection and Document 2010-06-24 - - - - - FAO terminology @@ -4025,29 +3980,39 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/ar/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - + - - + 1 + - + - - - - - + + + + 1 + + + + + + + + + + 1 + - + + - 1 - + @@ -4066,16 +4031,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - 1 - - - - - - - @@ -4087,6 +4042,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + 1 + + @@ -4113,7 +4073,7 @@ bibo has the domain of this property set to the union of Collection and Document - + @@ -4136,6 +4096,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + 1 + + @@ -4154,23 +4119,18 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate Short Definition from the bibo ontology - stable - - + - + http://purl.org/ontology/bibo/ - + + + A document (noun) is a bounded physical representation of body of information designed with the capacity (and usually intent) to communicate. A document may manifest symbolic, diagrammatic or sensory-representational information. @@ -4179,10 +4139,10 @@ bibo has the domain of this property set to the union of Collection and Document - - + - + + @@ -4190,10 +4150,10 @@ bibo has the domain of this property set to the union of Collection and Document - + - 1 - + 1 + FAO terminology @@ -4208,16 +4168,16 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/ar/ + + + 1 + + - - - 1 - - Short Definition from the bibo ontology @@ -4227,6 +4187,11 @@ bibo has the domain of this property set to the union of Collection and Document http://purl.org/ontology/bibo/ unstable + + + + + @@ -4260,17 +4225,17 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - An edited book. http://purl.org/ontology/bibo/ - + - - Best American Science Writing 2009 stable + An edited collection of stand-alone articles published as a book + + Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible. @@ -4279,21 +4244,21 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Short definition obtained here: http://en.wiktionary.org/wiki/geopolitical_entity. + + + + + - + - - - - - - 1 - + + 100 Caldwell Hall; 114 Martha Van Rensselaer (Rushmore Conference Room) @@ -4302,64 +4267,54 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Enter room number of name. - + 1 - - - - - - - - - - 1 - + - + - - + 1 + - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + @@ -4380,16 +4335,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://www.fao.org/termportal/contr/zh/ - - - 1 - - Examples shows a book has French language version. Public description source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . + + + + + @@ -4397,15 +4352,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + 1 - - - - - - + @@ -4420,22 +4370,17 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi 2010-06-24 http://www.fao.org/termportal/contr/ar/ - - - 1 - - - College of Arts & Sciences; Ivy Tech Community College A primary academic unit within a University or a free-standing higher education organization without graduate degree programs. + - + - - + 1 + Document1 isVersionOf Document2 @@ -4466,15 +4411,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - - - - + + + @@ -4483,11 +4423,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - http://purl.org/ontology/bibo/ Supreme Court Reporter @@ -4497,16 +4432,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Collection of legal cases stable - - - 1 - - - - - 1 - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/en/ @@ -4520,50 +4445,40 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - + + 1 + - + - + - + - - + - + + - + + - - - - - - 1 - - - - - 1 - + @@ -4573,11 +4488,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi UITS service - + + UITS service is the information technology services provided by Indiana University. SC. A regularly offered service in support of an academic, research, or administrative function (not personal or professional service by an individual) - @@ -4585,10 +4500,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - - + 1 + @@ -4598,11 +4513,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - 1 - - Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. @@ -4621,6 +4531,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + unstable @@ -4630,11 +4545,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ Short Definition from the bibo ontology - - - - - @@ -4646,16 +4556,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi This is done with a restriction on agent. - - - 1 - - - - - - - Code of Federal Regulations @@ -4666,10 +4566,20 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi A work consisting of texts of rules and regulations related to statutes issued by executive or administrative agencies A collection of statutes. + + + + + + + + + + + - Used information from this definition: http://dictionary.reference.com/browse/library. A collection of any materials, for study and enjoyment, which has been systematically arranged. Marston Science Library @@ -4688,10 +4598,15 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ - + - - + + + + + + + http://www.fao.org/termportal/contr/ar/ @@ -4706,10 +4621,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - + - - + 1 + @@ -4729,25 +4644,20 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - + - 1 - - - - - - - - - - - + + + + + + + @@ -4755,35 +4665,25 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi full email address - - - 1 - - We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - + - - - - - - 1 - + + + Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. - - - - + + + - + @@ -4798,16 +4698,21 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - + + + For data ingest from authoritative sources to record the actual way a person was listed as author, as potentially valuable information for author disambiguation. + + + + + @@ -4830,24 +4735,19 @@ We would like the range of core:outcome to be the union of Event and Process; an http://aims.fao.org/website/Search-AGROVOC/sub http://aims.fao.org/website/Search-AGROVOC/sub - - - 1 - - Used to link a bibliographic item to one of its contributor: can be an author, an editor, a publisher, etc. - + - 1 - + + - - - + + + @@ -4855,11 +4755,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - @@ -4892,11 +4787,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition http://en.wikipedia.org/wiki/Job_title#Job_title. - - - - - @@ -4904,6 +4794,21 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + + + + + + + + + 1 + + http://www.fao.org/figis/servlet/RefServlet http://www.fao.org/figis/servlet/RefServlet @@ -4916,17 +4821,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - Medical Subject Heading (MeSH) definition of Technical Report: Work consisting of a formal report giving details of the investigation and results of a medical or other scientific problem. When issued by a government agency or comparable official body, its contents may be classified, unclassified, or declassified with regard to security clearance. This publication type may also cover a scientific paper or article that records the current state or current position of scientific research and development. If so labeled by the editor or publisher, this publication type may be properly used for journal articles. A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc.. http://purl.org/ontology/bibo/ - + A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc. stable @@ -4968,37 +4868,47 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - + + + - - - + + + + - - - - - + + + + + + + + + + - - - + + + 1 + + + + + @@ -5023,10 +4933,10 @@ We would like the range of core:outcome to be the union of Event and Process; an A person registered in an undergraduate program leading to a bachelor's degree or an undergraduate diploma or certificate. - - - + + + An excerpted collection of words @@ -5037,24 +4947,39 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ Short Definition from the bibo ontology + + + + + + + + 1 + + + + + + + - A position involving academic work but without faculty status + + Researcher; Academic Extension Associate; Postdoctoral Associate Those positions are held by people who do academic work but do not have faculty positions in universities or institutes. - - - 1 + - + + @@ -5062,6 +4987,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -5075,26 +5005,16 @@ We would like the range of core:outcome to be the union of Event and Process; an An outreach or community service role directed outside a person's primary profession and institution Communicating Astronomy to the Public - - - - 2 - - - - 1 - - stable - A loose, thematic, collection of Documents, often Books. - + A thematic collection of documents, usually books, issued at regular or irregular intervals http://purl.org/ontology/bibo/ Methods in Molecular Biology + @@ -5102,11 +5022,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - Definition take from: http://dictionary.reference.com/browse/foundation. An institution financed by a donation or legacy to aid research, education, the arts, etc. @@ -5131,6 +5046,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik An identifier of serials, still in use by libraries, but replaced by ISSN for any new work stable + + + + + This is done with a restriction on agent. @@ -5143,16 +5063,31 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - + + + + + + + 1 + + + + + 1 + The showing of an object or a collection of objects, in an organized manner. + + + + + @@ -5161,18 +5096,13 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - - - - - - Short Definition modified from the one found here: http://www.thefreedictionary.com/county. Alachua; Baker; Bradford; Kenora; Ottawa; Waterloo The largest administrative division of most states or provinces. + @@ -5197,36 +5127,51 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + + + + 1 + + + Short Definition from the bibo ontology A distinct part of a larger document or collected document - + http://purl.org/ontology/bibo/ a distinct part of a larger document or collected document. + unstable - - - + - - + + - - + Short Definition copied from bibo ontology + + http://purl.org/ontology/bibo/ - + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers. - A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers stable - + + + + + + @@ -5235,11 +5180,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - @@ -5249,36 +5189,36 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + + + + + + - - - - + + + + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. - - - + + + - + 1 - - - - - - - - - - 1 - + @@ -5286,22 +5226,27 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + + + + + + A URLLink that is designated (by the user or anyone else) as a primary link for the person, organization, event, etc. - - - - - @@ -5320,30 +5265,30 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Note: Bibo:editor is used as the inverse of core:editorOf. Public Description for bibo:editor was obtained from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - - + + + + + + + + + + + - - - - - + A postdoctoral training appointment (job) - + 1 - - - - - - + @@ -5351,6 +5296,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + @@ -5373,6 +5323,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/es/ @@ -5391,6 +5346,21 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + + + + + + + + + + + @@ -5398,10 +5368,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - - + 1 + @@ -5431,6 +5401,26 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/termportal/en/ 2010-06-24 + + + + + + + + + + + + + + + + + + + + @@ -5440,10 +5430,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + + + + + + 1 - + 2010-04-01 @@ -5455,6 +5450,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49alpha.htm + + + + + paraphrased editorial note from the bibo ontology: We are not defining, using an enumeration, the range of the bibo:status to be a defined list of bibo:DocumentStatus. This is because we want people to be able to define new statuses if needed; and creating such an enumeration would prevent this. @@ -5463,11 +5463,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A list of items in a collection; an ordered compilation of item descriptions and sufficient information to afford access to them - NLM Catalog + + Short Definition is the Medical Subject Heading (MeSH) definition - diff --git a/productMods/WEB-INF/ontologies/user/scires-1.2-annotations.rdf b/productMods/WEB-INF/ontologies/user/scires-1.2-annotations.rdf index fc820434..c59ac7be 100644 --- a/productMods/WEB-INF/ontologies/user/scires-1.2-annotations.rdf +++ b/productMods/WEB-INF/ontologies/user/scires-1.2-annotations.rdf @@ -13,8 +13,8 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > - obo - Open Biological and Biomedical Ontologies + ero + Research Resources (eagle-i) -1 diff --git a/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf b/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf index a40f0ec0..e10dd2ff 100644 --- a/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf +++ b/productMods/WEB-INF/ontologies/user/vivo-core-1.2-annotations.rdf @@ -1895,8 +1895,8 @@ Please enter the complete phone number for your fax, with area code and also country code (if outside the US). - obo - Open Biological and Biomedical Ontologies + ero + Research Resources (eagle-i) 5 @@ -3374,8 +3374,8 @@ - -1 + -1 Agent diff --git a/productMods/WEB-INF/submodels/scires-1.2.owl b/productMods/WEB-INF/submodels/scires-1.2.owl index 36b87a36..1988f3bd 100644 --- a/productMods/WEB-INF/submodels/scires-1.2.owl +++ b/productMods/WEB-INF/submodels/scires-1.2.owl @@ -98,11 +98,6 @@ NOTE: For now we are not addressing whether this is a subclass of foaf:AgentMaterial entity that is used in a chemical reaction or other experimental process to detect, measure, examine, or produce other substances. - - - - - In Phase I trials, researchers test an experimental drug or treatment in a small group of people (20-80) for the first time to evaluate its safety, determine a safe dosage range, and identify side effects @@ -140,6 +135,11 @@ NOTE that we are not addressing for now the issue of whether a foaf:Person is a An implement used to facilitate work, especially precision work. + + + + + diff --git a/productMods/WEB-INF/submodels/vivo-core-1.2.owl b/productMods/WEB-INF/submodels/vivo-core-1.2.owl index cba8556e..7da66c03 100644 --- a/productMods/WEB-INF/submodels/vivo-core-1.2.owl +++ b/productMods/WEB-INF/submodels/vivo-core-1.2.owl @@ -19,17 +19,17 @@ xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsd="http://www.w3.org/2001/XMLSchema#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > + + + + + A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available A PMCID is a unique PubMed Central reference number, which is assigned to each full-text record made available in PubMed Central. The PMCID is issued shortly after the PI or author approves the PubMed Central formatted web version of the submission. - - - - - http://purl.org/ontology/bibo/ Short Definition from bibo ontology @@ -43,6 +43,11 @@ + + + 1 + + @@ -60,15 +65,10 @@ - - - - - - - + 1 + @@ -80,21 +80,6 @@ - - - 1 - - - - - 1 - - - - - - - unstable @@ -110,6 +95,11 @@ + + + + + @@ -118,17 +108,12 @@ - - + UN Cartographic Section UN Cartographic Section - - - - - - + + @@ -136,28 +121,28 @@ - + + + - - + + + + 1 + - - - - - Accounting & Research Services Assistant; Director of Information Technology Staff, support, and other non-academic positions. - - + A position classified as professional, staff, support, or any other non-academic role + @@ -172,20 +157,10 @@ Serial Item and Contribution Identifier - - - 1 - - - + 1 - - - - - - + @@ -196,11 +171,6 @@ - - - - - Definition take from: http://en.wikipedia.org/wiki/Government_agency. United States Library of Congress @@ -215,11 +185,6 @@ Public description modified from the information on this page: http://www.w3.org/TR/2005/WD-swbp-skos-core-guide-20050510/#sechierarchy . - - - - - @@ -235,11 +200,6 @@ - - - - - FAO's geopolitical ontology version 1.1 was populated with FAO, UN and internationally recognized data sources. FAO DISCLAIMER: The designations employed and the presentation of material do not imply the expression of any opinion whatsoever on the part of the Food and Agriculture Organization of the United Nations concerning the legal status of any country, territory, city or area, or of its authorities, or concerning the delimitation of its frontiers or boundaries. @@ -254,44 +214,39 @@ + + + 1 + + Definition take from: http://xmlns.com/foaf/spec/#term_based_near . foaf indicates that the status of this term is "unstable". "The based_near relationship relates two "spatial things" (anything that can be somewhere), the latter typically described using the geo:lat / geo:long geo-positioning vocabulary (http://www.w3.org/2003/01/geo/wgs84_pos#). This allows us to say describe the typical latitute and longitude of, say, a Person (people are spatial things - they can be places) without implying that a precise location has been given." Used to link an agent, related to bibliographic things, to a place where it is based near: can be a city, a monument, a building, etc. - - - - - Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - - - + + + + + The most general classification of a person - - + - - + + + - - - - - - - - + + + http://purl.org/ontology/bibo/ @@ -301,36 +256,21 @@ Starting page number within a continuous page range. stable - - - - - - - - - - - + - - - - - - - + 1 + @@ -340,21 +280,16 @@ http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - + + + 1 + + + - - - - - - - - - - stable @@ -364,11 +299,6 @@ Works prepared by hand including handwritten or typescript drafts of pre-publication papers or works not otherwise reproduced in multiple copies http://purl.org/ontology/bibo/ - - - - - @@ -385,6 +315,11 @@ + + + + + Smaller administrative division into which a country may be divided. @@ -394,8 +329,23 @@ + + + + + + + + + + + + + + + @@ -406,55 +356,25 @@ + + - + + - - - - - - - - - - - - - - - - - - - + - 1 - - - - - 1 - - - - - - - - - - 1 - + + @@ -468,6 +388,11 @@ + + + 1 + + @@ -499,6 +424,11 @@ http://www.fao.org/termportal/contr/es/ http://www.fao.org/termportal/contr/ar/ + + + + + @@ -506,11 +436,6 @@ - - - 1 - - @@ -518,21 +443,16 @@ - - - 1 - - - - - 1 - - Audiovisual recording in video format + + + + + Short Definition from the bibo ontology @@ -545,6 +465,11 @@ + + + + + @@ -566,14 +491,14 @@ http://www.fao.org/termportal/contr/es/ - - - - - + + + + + UN Statistics Division http://unstats.un.org/unsd/methods/m49/m49alpha.htm @@ -584,6 +509,16 @@ UN Statistics Division + + + + + + + + + + http://faostat.fao.org http://faostat.fao.org @@ -594,10 +529,10 @@ http://faostat.fao.org/default.aspx?lang=es FAOSTAT http://faostat.fao.org - + - 1 - + 1 + @@ -609,16 +544,21 @@ + + + + + + + + + + A short written piece focused on an event or announcement of note, having a defined publication time and of less enduring interest than a news feature. - - - 1 - - @@ -647,19 +587,14 @@ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ http://www.iso.org/iso/fr/country_codes/iso_3166_code_lists.htm - - - 1 - - - Authorship of journal articles, books and other original works is a means by which academics communicate the results of their scholarly work, establish priority for their discoveries, and build their reputation among their peers. This class allows for linking an author to a publication while indicating information about that author's authorship. Contains the authors name, their rank in the publication, and whether or not they are a corresponding author on the publication. + Currently any abstract name is given to members of this class. This could change in the future. @@ -670,20 +605,10 @@ This class allows for linking an author to a publication while indicating inform Bibo Definition: A seminar, discussion group, or the like, that emphasizes exchange of ideas and the demonstration and application of techniques, skills, etc. - + 1 - - - - - - - - - - - + @@ -704,11 +629,11 @@ This class allows for linking an author to a publication while indicating inform Committee on Institutional Cooperation (CIC); The Five Colleges of Ohio - Independent organizations formally working together toward a common goal, under an expressed agreement + + - @@ -717,13 +642,13 @@ This class allows for linking an author to a publication while indicating inform - - + + + A group of related documents issued at regular intervals. - http://purl.org/ontology/bibo/ - + stable @@ -762,16 +687,26 @@ This class allows for linking an author to a publication while indicating inform Short Definition take from http://en.wiktionary.org/wiki/continent. - - - 1 - - + + + + + + + + + + + + + + + http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/en/ @@ -877,6 +812,16 @@ This class allows for linking an author to a publication while indicating inform Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . + + + + + + + + + 2 + FAO terminology @@ -892,14 +837,19 @@ This class allows for linking an author to a publication while indicating inform - - - + + + - + - 1 - + + + + + + + @@ -916,10 +866,10 @@ This class allows for linking an author to a publication while indicating inform - + - - + 1 + Something designed, built, installed, etc., to serve a specific function or activity affording a convenience or service. @@ -933,15 +883,15 @@ This class allows for linking an author to a publication while indicating inform - + 1 - + - + + + - - @@ -950,6 +900,16 @@ This class allows for linking an author to a publication while indicating inform Regularly updated online journal or newsletter by one or more writers, called bloggers, containing articles and commentary of interest to the blogger + + + 1 + + + + + + + @@ -958,6 +918,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + @@ -1000,6 +965,21 @@ This class allows for linking an author to a publication while indicating inform Either city or town - a thickly populated area having fixed boundaries and certain local powers of government. + + + 1 + + + + + + + + + + 1 + + @@ -1009,26 +989,26 @@ This class allows for linking an author to a publication while indicating inform - That is a position held by an academic faculty member who works for administration. Associate Dean + + An academic administrative position (associate dean, etc.) as distinct from a professional administrative position (non-academic) - server; Bruker Vector-33 FT-IR - A network server is one example. Medical schools and research laboratories can list professional equipment, such as microscopes. - + A physical object provided for specific purpose, task or occupation. - + + - + + - 1 - + @@ -1040,21 +1020,21 @@ This class allows for linking an author to a publication while indicating inform - http://purl.org/ontology/bibo/ A specific journal article - + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a periodical or book + Short Definition modified from the bibo ontology. - + A written composition in prose, usually nonfiction, on a specific topic, forming an independent part of a book or other publication, as a newspaper or magazine. stable - + + Director of Admissions and Placement; Associate University Librarian - Particular position in an organization, commonly identified by job title, and normally associated with a job description that details the tasks and responsibilities that go with the position. An employment activity, whether compensated or not. Short definition comes from http://en.wikipedia.org/wiki/Position, and has been modified. @@ -1070,6 +1050,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + The thesis degree. @@ -1084,7 +1069,7 @@ This class allows for linking an author to a publication while indicating inform An organizational unit (as opposed to the physical facility) that performs research, provides services, or processes materials - + @@ -1098,15 +1083,15 @@ This class allows for linking an author to a publication while indicating inform - - - - - + + + + + Relates a document to an event; for example, a paper to a conference. @@ -1118,6 +1103,11 @@ This class allows for linking an author to a publication while indicating inform unstable + + + + + Agricultural area, this category is the sum of areas under a) arable land - land under temporary agricultural crops (multiple-cropped areas are counted only once), temporary meadows for mowing or pasture, land under market and kitchen gardens and land temporarily fallow (less than five years). The abandoned land resulting from shifting cultivation is not included in this category. Data for “Arable land” are not meant to indicate the amount of land that is potentially cultivable; (b) permanent crops - land cultivated with long-term crops which do not have to be replanted for several years (such as cocoa and coffee); land under trees and shrubs producing flowers, such as roses and jasmine; and nurseries (except those for forest trees, which should be classified under "forest"); and (c) permanent meadows and pastures - land used permanently (five years or more) to grow herbaceous forage crops, either cultivated or growing wild (wild prairie or grazing land). Data are expressed in 1000 hectares. http://faostat.fao.org/site/375/default.aspx @@ -1147,6 +1137,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + Use for teaching roles other than specific for-credit courses within a person's home institution. Use for teaching experiences other than specific for-credit courses within a person's home institution. @@ -1155,13 +1150,8 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - + 1 + @@ -1174,28 +1164,28 @@ This class allows for linking an author to a publication while indicating inform http://faostat.fao.org/DesktopDefault.aspx?PageID=550&lang=es#ancor 2009-09-21 - - - - - US Patent Data; US Job Data A named collection of data, usually containing only one type of data - + - - + + - + Computer program and its related documentation; directs the operation of a computer + + + + + An agreement involving specific deliverables and payment @@ -1218,6 +1208,11 @@ This class allows for linking an author to a publication while indicating inform unstable A written argument submitted to a court. + + + + + A date and/or time @@ -1229,11 +1224,6 @@ This class allows for linking an author to a publication while indicating inform - - - - - http://www.fao.org/termportal/contr/es/ @@ -1274,6 +1264,11 @@ This class allows for linking an author to a publication while indicating inform 020530902X + + + 1 + + Member of the International Conference on Complex Systems Organizing Committee @@ -1285,41 +1280,31 @@ This class allows for linking an author to a publication while indicating inform Note that the administering department is not the central research administration office (such as University of Florida DSP or Cornell OSP) -- we didn't see a need to record a relationship to that office because it implicitly manages all grants. - - - - - - - - - - - - 1 - - - - - - - - 1 - + - 1 - + 1 + A person working in a position of librarian or information professional, or academic or technical expert in support of providing information services or materials. + + + + + + + + + + http://www.fao.org/termportal/contr/zh/ @@ -1333,32 +1318,22 @@ This class allows for linking an author to a publication while indicating inform 2010-06-24 FAO terminology - + - - + 1 + stable - + + A scholarly academic article, typically published in a journal. - http://purl.org/ontology/bibo/ Written by scholars for other scholars, typically published in an academic journal with an abstract and bibliography A specific academic journal article - - - 1 - - - - - 1 - - @@ -1370,15 +1345,30 @@ This class allows for linking an author to a publication while indicating inform - + - - + 1 + - + + + + + + + + + + + 1 - + + + + + + @@ -1405,10 +1395,10 @@ This class allows for linking an author to a publication while indicating inform http://www.un.org/Depts/Cartographic/french/htmain.htm UN Cartographic Section - + - - + 1 + @@ -1429,6 +1419,11 @@ This class allows for linking an author to a publication while indicating inform Role of a person designated by a grantee to direct a project or activity being supported by a grant, and who is accountable to the grantee for the proper conduct of the project or activity. Also known as Program Director or Project Director. + + + + + Definition take from here: http://dictionary.reference.com/browse/school. @@ -1449,16 +1444,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/en/ - - - - - - - - 1 - - http://www.fao.org/termportal/contr/ar/ http://www.fao.org/termportal/contr/fr/ @@ -1472,11 +1457,6 @@ This class allows for linking an author to a publication while indicating inform http://www.fao.org/termportal/contr/es/ - - - - - @@ -1488,6 +1468,11 @@ This class allows for linking an author to a publication while indicating inform + + + + + @@ -1499,18 +1484,18 @@ This class allows for linking an author to a publication while indicating inform - - - - - Definition taken from: http://en.wikipedia.org/wiki/University - University of Florida; Washington University in St. Louis An institution of higher education and research, which grants academic degrees in a variety of subjects, and provides both undergraduate education and postgraduate education. + + + + + + @@ -1524,35 +1509,30 @@ This class allows for linking an author to a publication while indicating inform It's anticipated that the subclasses will be used when classifying items. And, all locations can be viewable via this class. Use subclasses of core:Location when classsifying items. - + - - + 1 + - A document created as a basis for discussion or a very early draft of a formal paper - + + - - - - - - 1 - + 1 + - - + + @@ -1580,11 +1560,6 @@ This class allows for linking an author to a publication while indicating inform International Standard Serial Number - - - - - @@ -1592,6 +1567,16 @@ This class allows for linking an author to a publication while indicating inform source of definition: http://www.uspto.gov/main/glossary/#p . The following site has patent number formats: http://www.uspto.gov/patents/ebc/kindcodesum.jsp . + + + + + + + + + + @@ -1600,6 +1585,7 @@ This class allows for linking an author to a publication while indicating inform + http://purl.org/ontology/bibo/ @@ -1608,7 +1594,6 @@ This class allows for linking an author to a publication while indicating inform A periodical of scholarly journal Articles. Contains original scholarly research or review articles by experts in the field Journal of Information Science; IEEE Intelligent System; Scientometrics - http://purl.org/ontology/bibo/ @@ -1619,20 +1604,15 @@ This class allows for linking an author to a publication while indicating inform Contains news articles, opinions, features, advertising, and is usually issued daily or weekly - - - - - - - - - - - + 1 - + + + + + 1 + @@ -1656,20 +1636,15 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - - - + + + + + @@ -1683,28 +1658,23 @@ This class allows for linking an author to a publication while indicating inform - + - - - - - - - - - - - - + 1 + - Wiley Prize in Biomedical Sciences + An Award or Honor An Award or Honor + + + + + @@ -1718,15 +1688,10 @@ This class allows for linking an author to a publication while indicating inform - - - - - - + 1 - + @@ -1742,26 +1707,21 @@ This class allows for linking an author to a publication while indicating inform An agent that receives a communication document. - - - - - - - - + Only use if no specific subclasses of core:EventSeries desribe the activity. - A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. - + A generic class which may include a conference series, a course section, a seminar series, or a workshop series. When possible, use one of these more specific classes. + + Two or more events that follow on one after the other or are connected one after the other. - + + @@ -1771,37 +1731,17 @@ This class allows for linking an author to a publication while indicating inform - - - - - - - - 1 - - - - - - - - - - 1 - - @@ -1821,20 +1761,20 @@ use one freetextKeyword assertion for each keyword or phrase. We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - + - - + + + + + + 1 + - - - 1 - - @@ -1842,40 +1782,25 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - - - - - - + Represents educational training that has been received. - + This connects person to their academic degree through this educational training, but can also be used when the training does not result in a degree. Currently any abstract name is given to individuals of this class. This could change in the future. - - - - - - - + A paper presented at a conference; optionally collected into a Proceedings or a special Journal issue - + - + - - + 1 + @@ -1884,7 +1809,7 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ - + Facebook; VIVOweb.org; Flickr A group of Webpages accessible on the Web. A group of webpages available within a specific parent address or URL on the World Wide Web @@ -1909,37 +1834,27 @@ We would like the range of core:outcome to be the union of Event and Process; an Work consisting of collections of previously published works - Short Definition is the Medical Subject Heading (MeSH) definition A document that simultaneously contains other documents. http://purl.org/ontology/bibo/ stable + functions as an n-ary predicate a reified relationship - - - - - + An area of corporate activity organized as an administrative or functional unit. Definition modified from http://www.thefreedictionary.com/division. It is difficult to tell the difference between a division and a department. Cardiovascular Medicine (division within medicine) - - - - - - The Ornithological Newsletter @@ -1947,11 +1862,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - @@ -1960,7 +1870,7 @@ We would like the range of core:outcome to be the union of Event and Process; an VIVO Outreach Team; VIVO Ontology Team - + An informal organization brought together for the purposes of a project or event. @@ -1980,10 +1890,10 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + 1 + Definition take from: http://dictionary.reference.com/browse/hospital. @@ -2003,18 +1913,13 @@ We would like the range of core:outcome to be the union of Event and Process; an The academic degree of a Thesis - + Alchohol Education Center; Center for Arts and Public Policy; Hearing Research Center A place where a particular activity or service is concentrated. Short Definition take from http://www.thefreedictionary.com/center. - - - - - Country area, area of the country including area under inland water bodies, but excluding offshore territorial waters. Possible variations in the data may be due to updating and revisions of the country data and not necessarily to any change of area. Data are expressed in 1000 hectares. http://faostat.fao.org/site/375/default.aspx FAOSTAT @@ -2030,6 +1935,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Indicates the precision of the value of a DateTimeValue instance. + + + + + For example an HR job title for a person might be - Assistant University Librarian, and the preferred job title for that same person could be - Physical Sciences Librarian. @@ -2038,15 +1948,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - Short Definition from OCLC Input Standards, EntW A document created to summarize research findings associated with the completion of an academic degree. stable - http://purl.org/ontology/bibo/ Works created to satisfy the requirements for an academic certification or degree; also called dissertation + + @@ -2055,11 +1965,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - 1 - - @@ -2081,11 +1986,11 @@ We would like the range of core:outcome to be the union of Event and Process; an Only use if no specific subclasses of core:Role describe the role. + - + A person's or organization's type of contribution to an endeavor Only use this broad role class if no subclasses of role describe the item being classified. - @@ -2105,15 +2010,15 @@ We would like the range of core:outcome to be the union of Event and Process; an - + 1 - + - - - + + + @@ -2137,7 +2042,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A structured file of information or a set of logically related data stored and retrieved using computer-based means Short Definition is the Medical Subject Heading (MeSH) definition - + PubMed @@ -2156,7 +2061,7 @@ We would like the range of core:outcome to be the union of Event and Process; an A meeting for consultation or discussion. - + @@ -2166,27 +2071,37 @@ We would like the range of core:outcome to be the union of Event and Process; an - + A distinct, usually ongoing and specialized unit within a large organization. Definition modified from the definition here: http://dictionary.reference.com/browse/department. It is difficult to tell the difference between and department and a division. Legal (department within a company); Use for any non-academic department - + + + + + + 1 - + + + + + + An online article or commentary appearing on a blog + A specific blog posting - - + Collection of documents or information resources that have a unified identity stable @@ -2205,11 +2120,6 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable - - - 1 - - A private company is one that is privately-owned, and thus, is not publicly-traded in the stock market. Members of the general public cannot purchase stock in a private company unless that company chooses to go public and become a public company. @@ -2217,10 +2127,10 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition obtained here: http://answers.ask.com/Business/Finance/what_is_a_private_company. Examples of private companies found here: http://www.forbes.com/2008/11/03/largest-private-companies-biz-privates08-cx_sr_1103private_land.html - + - - + + @@ -2231,9 +2141,9 @@ We would like the range of core:outcome to be the union of Event and Process; an B.A. Bachelor of Arts This list may have multiple abbreviations for some degrees. + An academic degree at any level, both as reported by individuals for employment and as offered by academic degree programs. - - + @@ -2273,11 +2183,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - @@ -2285,9 +2190,9 @@ We would like the range of core:outcome to be the union of Event and Process; an + - phonograph record; tape; CD; DVD; DAT An audio document; aka record. http://purl.org/ontology/bibo/ @@ -2315,6 +2220,21 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ + + + + + + + 1 + + + + + + + + FAO terminology @@ -2328,18 +2248,13 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ 2010-06-24 - - - - - http://purl.org/ontology/bibo/ film; video; Blu-ray Audiovisual recording in any format + - stable An audio-visual document; film, video, and so forth. @@ -2351,11 +2266,6 @@ We would like the range of core:outcome to be the union of Event and Process; an An area of land distinguished by its political autonomy. Politically independent territories. - - - - - Use subclasses of core:Geographic Region subclasses instead of this class if possible. @@ -2392,11 +2302,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - UN cartographic maps (http://www.un.org/Depts/Cartographic/map/profile/world.pdf) @@ -2424,12 +2329,22 @@ We would like the range of core:outcome to be the union of Event and Process; an + A defined class of organizations that fund Grants. - National Institute of Health (NIH) + + + + + + + + + + @@ -2438,13 +2353,18 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition found here: http://dictionary.reference.com/browse/publisher A person or company whose business is the publishing of books, periodicals, engravings, computer software, etc. - Elsevier; Harper & Row; Indiana University Press + - + + - 1 - + + + + + + @@ -2463,11 +2383,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Afghanistan; Antigua and Barbuda; Cameroon; Iceland; Jamaica; Nigeria; United States of America - - - - - @@ -2476,6 +2391,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + 2010-06-24 @@ -2489,6 +2409,16 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/fr/ + + + + + + + + + + @@ -2497,17 +2427,12 @@ We would like the range of core:outcome to be the union of Event and Process; an + The full URL. Uniform Resource Locator (URL) specifies where an identified resource is available and the mechanism for retrieving it. - http://info.slis.indiana.edu/~katy/ - - - - - @@ -2522,6 +2447,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -2534,6 +2464,11 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ stable + + + + + http://www.fao.org/termportal/contr/ar/ @@ -2554,6 +2489,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + Short Definition copied from bibo ontology @@ -2569,30 +2509,30 @@ We would like the range of core:outcome to be the union of Event and Process; an Public Definition source (http://www.answers.com/topic/publisher). + + + + + An Institute normally has a research focus but may also fulfill instructional or outreach roles. Institute for Fundamental Theory - - - - - - This class will display all the instances in the subclasses below it, as well as any organizations that were added as part of this generic class because there wasn't a specific class available. - Only use if no specific subclasses of foaf:organization desribe the organization. - A generic class encompassing several types of organizations. - + + Only use if no specific subclasses of foaf:organization desribe the organization. - + + A generic class encompassing several types of organizations. + + - Ued to describe an organization related to bibliographic items such as a publishing company, etc. @@ -2608,22 +2548,42 @@ We would like the range of core:outcome to be the union of Event and Process; an http://www.fao.org/termportal/contr/zh/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ + + + + + - + 1 - + + + + + + + + + + 1 + A Person holding an academic employment appointment focused on research rather than teaching; temporary (or for some defined term) + + + 1 + + @@ -2632,6 +2592,16 @@ We would like the range of core:outcome to be the union of Event and Process; an definition modified from: source (http://en.wikipedia.org/wiki/Seating_capacity). 55 + + + + + + + + + + @@ -2643,16 +2613,21 @@ We would like the range of core:outcome to be the union of Event and Process; an - + - - + 1 + + + + + + @@ -2664,25 +2639,50 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + + + + + + - + + Only use if no specific subclasses of event:Event are appropriate. - - + This class will also display instances of subclasses under Event, e.g. Philosophy Department Discussion Club; 2009 Racker Lecture; screening of a documentary. In addition to a location in space and time, an event may have any or all the following qualities: actively participating agents, passive factors, work products. Also, it may be in a virtual space or part of a series such as a lecture series. The previous short definition was: "An arbitrary classification of a space/time region, by a cognitive agent." - - - - - - - + + + + + + Something that happens at a given place and time. - - + + + + + + + + + + + + + + + + + + @@ -2711,27 +2711,12 @@ The previous short definition was: "An arbitrary classification of a space/time - - - - - - - - - - - - - - - A visual representation such as a photograph or graph @@ -2750,19 +2735,29 @@ The previous short definition was: "An arbitrary classification of a space/time + + + 1 + + + + + + + - - An award, honor, or distinction received by a person on a particular date (not the award itself as given repeatedly, and not a grant award). - A specific award on a particular date or for a particular date range. + + + Ninth annual Wiley Prize in Biomedical Sciences, for the discovery of a light activated ion channel @@ -2772,6 +2767,11 @@ The previous short definition was: "An arbitrary classification of a space/time + + + + + Short Definition from the bibo ontology http://purl.org/ontology/bibo/ @@ -2781,6 +2781,16 @@ The previous short definition was: "An arbitrary classification of a space/time Draft legislation presented for discussion to a legal body. stable + + + + + + + + + + @@ -2795,10 +2805,10 @@ The previous short definition was: "An arbitrary classification of a space/time Professor, associate professor and assistant professor are common positions for academic faculty. - Professor; Associate Professor; Assistant Professor Academic position in a university or institution - + + @@ -2810,26 +2820,21 @@ The previous short definition was: "An arbitrary classification of a space/time http://en.wikipedia.org/wiki/Global_Trade_Item_Number. Global Trade Item Number 14 - - - - - The dual relationship of a professor advising a student and the student being advised by a professor, typically including start and end dates - + - + + + - - - - + + + - @@ -2841,15 +2846,10 @@ The previous short definition was: "An arbitrary classification of a space/time - + - - - - - - - + 1 + @@ -2872,25 +2872,20 @@ modern society using the world of Star trek. Los Angeles Times, March An section number - + - 1 - + 1 + - + - - - - - - - + 1 + http://www.fao.org/termportal/contr/en/ @@ -2905,6 +2900,11 @@ modern society using the world of Star trek. Los Angeles Times, March http://www.fao.org/termportal/en/ 2010-06-24 + + + + + Used to relate a reference citation to a bibliographic resource. @@ -2918,20 +2918,15 @@ modern society using the world of Star trek. Los Angeles Times, March An agent that interview another agent. - - + + + - - - - - - @@ -2943,19 +2938,24 @@ modern society using the world of Star trek. Los Angeles Times, March http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet + + + + + a specific period or duration, defined by (optional) start and end date/times. - + + + 1 + + + 1 - - - - - - + @@ -2973,21 +2973,26 @@ modern society using the world of Star trek. Los Angeles Times, March Short Definition from bibo ontology - - - - - - + 1 - + + + + + + Written script for a film production, including dialogue and descriptions of gestures, actions, shooting directions + + + + + @@ -3006,31 +3011,21 @@ modern society using the world of Star trek. Los Angeles Times, March 2010-06-24 http://www.fao.org/termportal/contr/zh/ - - - - - The value of the datatype property *validSince* associated to a particular area (territory or group) indicates the area's first year of validity. The geopolitical ontology traces back historic changes only until 1985, therefore, if an area has a validSince = 1985, this indicates that the area is/was valid since 1985 or before. - + - - + + - - - - - - + 1 - + @@ -3044,15 +3039,15 @@ modern society using the world of Star trek. Los Angeles Times, March - + - 1 - + + - + - - + + @@ -3142,25 +3137,15 @@ Examples of a Publisher include a person, an organization, or a service. Typical http://purl.org/ontology/bibo/ - + - 1 - + + - - - + - - - - - - - - - - + + http://www.fao.org/termportal/contr/es/ @@ -3175,29 +3160,34 @@ Examples of a Publisher include a person, an organization, or a service. Typical 2010-06-24 - - - 1 - - Resource dependent on other entities This class is here so it can be equivalent to vitro:DependentResource. Deletion in the VIVO system behaves differently when deleting members of this class: related individuals may need to be deleted as well. + + + + + + + + 1 + + A distinct, usually specialized educational unit within an educational organization. - - + + Endodontics (department within a College of Dentistry); English (department within a College of Liberal Arts) - + - - + + @@ -3234,16 +3224,16 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + - - - + + An intramural or extramural award to support scholarly work, such as UF09179 (VIVO) Short definition is from the Glossary of NIH Terms. - Financial assistance mechanism providing money, property, or both to an eligible entity to carry out an approved project or activity + @@ -3272,6 +3262,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/A legal decision that reverses a ruling. http://purl.org/ontology/bibo/ + + + + + @@ -3307,11 +3302,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/2010-06-24 http://www.fao.org/termportal/en/ - - - - - Universal Product Code @@ -3333,11 +3323,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/Intel Talent Search; poetry contest Not the same as an award or distinction. - - - - - @@ -3358,11 +3343,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - @@ -3379,11 +3359,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ 0.7 - - - - - http://purl.org/ontology/bibo/ New Yorker @@ -3397,17 +3372,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Address has properties for department name, street, city, state or province, postal code, and country. For US specific address, classify using core:US Postal Code. core:Address will display all addresses. - University of Waterloo, 200 University Avenue West, Waterloo, Ontario, Canada N2L 3G1 + A code and abstract concept expressing a location on the Earth's surface. To classify US specific addresses, use core:US Postal Code. Librarian; Library Systems Analyst; Music Bibliographer It is the common position in libraries. - A position held by library and information science professionals, or academic or technical experts, in support of providing information services or materials - + + @@ -3423,15 +3398,10 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/es/ - - - - - - + 1 - + @@ -3445,11 +3415,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - http://purl.org/ontology/bibo/ stable @@ -3465,22 +3430,12 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - A group can also be an organization but need not be; typically used for looser associations of people or organizations acting together in some fashion, not necessarily through formal agreement or on a long-term basis. Added to the VIVO ontology to be able to support informal and perhaps even private groups of people around an idea, funding opportunity, or event. A group of agents - - - 1 - - http://purl.org/ontology/bibo/ unstable @@ -3492,16 +3447,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Curriculum Steering Committee; PhD Advisory Committee + A group of people organized for a specific purpose (e.g., a reporting or advisory role), often with a charge and for a specific duration. - There could be many subclasses such as thesis committee or tenure committee, but these may typically be differentiated via the moniker unless distinct properties become important. - - - - - Short Definition from OCLC Input Standards, EntW http://purl.org/ontology/bibo/ @@ -3530,23 +3480,28 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + 1 + + + + + + + This term is intended to be used with non-literal values as defined in the DCMI Abstract Model (http://dublincore.org/documents/abstract-model/). As of December 2007, the DCMI Usage Board is seeking a way to express this intention with a formal range declaration. - - - - - - + 1320 East 10th Street, Wells Library 021 Bloomington, IN 47405 - - Formal address in US postal address system. + + US postal address follow the format street, apt or office number (optional), city, state, and zipcode. @@ -3556,15 +3511,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + - - - - - @@ -3578,22 +3533,17 @@ Definition source: http://isiwebofknowledge.com/researcherid/ A web page is an online document available (at least initially) on the world wide web. A web page is written first and foremost to appear on the web, as distinct from other online resources such as books, manuscripts or audio documents which use the web primarily as a distribution mechanism alongside other more traditional methods such as print. - - - - - - - + Short Definition from the bibo ontology + unstable A section of a book - - + http://purl.org/ontology/bibo/ + A section of a book. @@ -3607,15 +3557,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - + 1 + - + - - + + @@ -3631,11 +3581,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - radio or newspaper interview @@ -3645,6 +3590,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/stable + + + + + @@ -3652,16 +3602,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - - - - - - Definition was take from here: http://dictionary.reference.com/browse/museum @@ -3696,36 +3636,41 @@ Definition source: http://isiwebofknowledge.com/researcherid/FAO terminology http://www.fao.org/termportal/contr/fr/ - - - - - + + + + + + + + + + + + + + + - + - - - - - - 1 - + + @@ -3769,11 +3714,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/Not sure how to access the "Editor's Comments". But as North America is a continent, it would be placed directly into the continent subclass and viewable through this class along with any other subclass entities. Any region that goes beyond national boundaries and does not fit into any subclass of core:TransnationalRegion. - - - - - @@ -3781,29 +3721,49 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + + + + + + + + + + + + + + + + A short form for an longer title or name. B.A. - + - - + + A person holding a position that is not considered to be an academic appointment. - + @@ -3820,10 +3780,15 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - + - - + + + + + + 1 + @@ -3832,16 +3797,6 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - - - - - - - 1 - - A location having coordinates in geographic space. @@ -3889,16 +3844,21 @@ Definition source: http://isiwebofknowledge.com/researcherid/ + + + + + Used for a single narrative summary of research, typically covering a wide range of activities and time periods; use Researcher Role for information on individual activities - + - - + + A role involving research (funded or unfunded), sometimes linked to a grant @@ -3907,6 +3867,11 @@ Definition source: http://isiwebofknowledge.com/researcherid/ Bacteria-resistant bandage; Termite prevention system; Hurricane resistant houses + + + + + Relates a document to some transcribed original. The bibo:transcriptOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . Bibo considers this term unstable. @@ -3916,20 +3881,20 @@ Definition source: http://isiwebofknowledge.com/researcherid/unstable + + + + + - + - - - - - - - + 1 + @@ -3951,18 +3916,13 @@ Definition source: http://isiwebofknowledge.com/researcherid/ - - + + An offering through an ongoing program or single request of research support: internships, positions, financial awards or other forms of tangible or intangible support - - - - - - - 1 - + + + @@ -4007,11 +3967,6 @@ bibo has the domain of this property set to the union of Collection and Document 2010-06-24 - - - - - FAO terminology @@ -4025,29 +3980,39 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/ar/ FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - + - - + 1 + - + - - - - - + + + + 1 + + + + + + + + + + 1 + - + + - 1 - + @@ -4066,16 +4031,6 @@ bibo has the domain of this property set to the union of Collection and Document - - - 1 - - - - - - - @@ -4087,6 +4042,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + 1 + + @@ -4113,7 +4073,7 @@ bibo has the domain of this property set to the union of Collection and Document - + @@ -4136,6 +4096,11 @@ bibo has the domain of this property set to the union of Collection and Document + + + 1 + + @@ -4154,23 +4119,18 @@ bibo has the domain of this property set to the union of Collection and Document - - - - - A bounded physical representation of a body of information designed with the capacity (and usually intent) to communicate Short Definition from the bibo ontology - stable - - + - + http://purl.org/ontology/bibo/ - + + + A document (noun) is a bounded physical representation of body of information designed with the capacity (and usually intent) to communicate. A document may manifest symbolic, diagrammatic or sensory-representational information. @@ -4179,10 +4139,10 @@ bibo has the domain of this property set to the union of Collection and Document - - + - + + @@ -4190,10 +4150,10 @@ bibo has the domain of this property set to the union of Collection and Document - + - 1 - + 1 + FAO terminology @@ -4208,16 +4168,16 @@ bibo has the domain of this property set to the union of Collection and Document http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/ar/ + + + 1 + + - - - 1 - - Short Definition from the bibo ontology @@ -4227,6 +4187,11 @@ bibo has the domain of this property set to the union of Collection and Document http://purl.org/ontology/bibo/ unstable + + + + + @@ -4260,17 +4225,17 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - An edited book. http://purl.org/ontology/bibo/ - + - - Best American Science Writing 2009 stable + An edited collection of stand-alone articles published as a book + + Use subclasses of core:GeopoliticalEntity subclasses instead of this class if possible. @@ -4279,21 +4244,21 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Short definition obtained here: http://en.wiktionary.org/wiki/geopolitical_entity. + + + + + - + - - - - - - 1 - + + 100 Caldwell Hall; 114 Martha Van Rensselaer (Rushmore Conference Room) @@ -4302,64 +4267,54 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Enter room number of name. - + 1 - - - - - - - - - - 1 - + - + - - + 1 + - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + @@ -4380,16 +4335,16 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://www.fao.org/termportal/contr/zh/ - - - 1 - - Examples shows a book has French language version. Public description source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . + + + + + @@ -4397,15 +4352,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + 1 - - - - - - + @@ -4420,22 +4370,17 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi 2010-06-24 http://www.fao.org/termportal/contr/ar/ - - - 1 - - - College of Arts & Sciences; Ivy Tech Community College A primary academic unit within a University or a free-standing higher education organization without graduate degree programs. + - + - - + 1 + Document1 isVersionOf Document2 @@ -4466,15 +4411,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - - - - + + + @@ -4483,11 +4423,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - - - http://purl.org/ontology/bibo/ Supreme Court Reporter @@ -4497,16 +4432,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Collection of legal cases stable - - - 1 - - - - - 1 - - http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/en/ @@ -4520,50 +4445,40 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - - - + + 1 + - + - + - + - - + - + + - + + - - - - - - 1 - - - - - 1 - + @@ -4573,11 +4488,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi UITS service - + + UITS service is the information technology services provided by Indiana University. SC. A regularly offered service in support of an academic, research, or administrative function (not personal or professional service by an individual) - @@ -4585,10 +4500,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - + - - + 1 + @@ -4598,11 +4513,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi - - - 1 - - Since we have defined geopolitical.owl.hasMember to be a subproperty of core:hasMember, we should not make changes to this property that would change the definition of geopolitical.owl.hasMember in ways that may make it inconsistent with its usage in other ontologies. @@ -4621,6 +4531,11 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi + + + + + unstable @@ -4630,11 +4545,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ Short Definition from the bibo ontology - - - - - @@ -4646,16 +4556,6 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi This is done with a restriction on agent. - - - 1 - - - - - - - Code of Federal Regulations @@ -4666,10 +4566,20 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi A work consisting of texts of rules and regulations related to statutes issued by executive or administrative agencies A collection of statutes. + + + + + + + + + + + - Used information from this definition: http://dictionary.reference.com/browse/library. A collection of any materials, for study and enjoyment, which has been systematically arranged. Marston Science Library @@ -4688,10 +4598,15 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi http://purl.org/ontology/bibo/ - + - - + + + + + + + http://www.fao.org/termportal/contr/ar/ @@ -4706,10 +4621,10 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi FAO terminology FAO terminology. FAOTERM. http://www.fao.org/termportal/en/ - + - - + 1 + @@ -4729,25 +4644,20 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi Public Description for bibo:distributor taken from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - + - 1 - - - - - - - - - - - + + + + + + + @@ -4755,35 +4665,25 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi full email address - - - 1 - - We would like the range of core:outcome to be the union of Event and Process; and that same union to be the range for core:outcomeOf, but we cannot currently express this with the editor. - + - - - - - - 1 - + + + Used to describe any "agent" related to bibliographic items. Such agents can be persons, organizations or groups of any kind. - - - - + + + - + @@ -4798,16 +4698,21 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - + + + For data ingest from authoritative sources to record the actual way a person was listed as author, as potentially valuable information for author disambiguation. + + + + + @@ -4830,24 +4735,19 @@ We would like the range of core:outcome to be the union of Event and Process; an http://aims.fao.org/website/Search-AGROVOC/sub http://aims.fao.org/website/Search-AGROVOC/sub - - - 1 - - Used to link a bibliographic item to one of its contributor: can be an author, an editor, a publisher, etc. - + - 1 - + + - - - + + + @@ -4855,11 +4755,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - @@ -4892,11 +4787,6 @@ We would like the range of core:outcome to be the union of Event and Process; an Definition http://en.wikipedia.org/wiki/Job_title#Job_title. - - - - - @@ -4904,6 +4794,21 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + + + + + + + + + 1 + + http://www.fao.org/figis/servlet/RefServlet http://www.fao.org/figis/servlet/RefServlet @@ -4916,17 +4821,12 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - Medical Subject Heading (MeSH) definition of Technical Report: Work consisting of a formal report giving details of the investigation and results of a medical or other scientific problem. When issued by a government agency or comparable official body, its contents may be classified, unclassified, or declassified with regard to security clearance. This publication type may also cover a scientific paper or article that records the current state or current position of scientific research and development. If so labeled by the editor or publisher, this publication type may be properly used for journal articles. A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc.. http://purl.org/ontology/bibo/ - + A document describing an account or statement describing in detail an event, situation, or the like, usually as the result of observation, inquiry, etc. stable @@ -4968,37 +4868,47 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - + + + - - - + + + + - - - - - + + + + + + + + + + - - - + + + 1 + + + + + @@ -5023,10 +4933,10 @@ We would like the range of core:outcome to be the union of Event and Process; an A person registered in an undergraduate program leading to a bachelor's degree or an undergraduate diploma or certificate. - - - + + + An excerpted collection of words @@ -5037,24 +4947,39 @@ We would like the range of core:outcome to be the union of Event and Process; an http://purl.org/ontology/bibo/ Short Definition from the bibo ontology + + + + + + + + 1 + + + + + + + - A position involving academic work but without faculty status + + Researcher; Academic Extension Associate; Postdoctoral Associate Those positions are held by people who do academic work but do not have faculty positions in universities or institutes. - - - 1 + - + + @@ -5062,6 +4987,11 @@ We would like the range of core:outcome to be the union of Event and Process; an + + + + + @@ -5075,26 +5005,16 @@ We would like the range of core:outcome to be the union of Event and Process; an An outreach or community service role directed outside a person's primary profession and institution Communicating Astronomy to the Public - - - - 2 - - - - 1 - - stable - A loose, thematic, collection of Documents, often Books. - + A thematic collection of documents, usually books, issued at regular or irregular intervals http://purl.org/ontology/bibo/ Methods in Molecular Biology + @@ -5102,11 +5022,6 @@ We would like the range of core:outcome to be the union of Event and Process; an - - - - - Definition take from: http://dictionary.reference.com/browse/foundation. An institution financed by a donation or legacy to aid research, education, the arts, etc. @@ -5131,6 +5046,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik An identifier of serials, still in use by libraries, but replaced by ISSN for any new work stable + + + + + This is done with a restriction on agent. @@ -5143,16 +5063,31 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - + + + + + + + 1 + + + + + 1 + The showing of an object or a collection of objects, in an organized manner. + + + + + @@ -5161,18 +5096,13 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/figis/servlet/RefServlet Fisheries Global Information System http://www.fao.org/figis/servlet/RefServlet - - - - - - Short Definition modified from the one found here: http://www.thefreedictionary.com/county. Alachua; Baker; Bradford; Kenora; Ottawa; Waterloo The largest administrative division of most states or provinces. + @@ -5197,36 +5127,51 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + + + + 1 + + + Short Definition from the bibo ontology A distinct part of a larger document or collected document - + http://purl.org/ontology/bibo/ a distinct part of a larger document or collected document. + unstable - - - + - - + + - - + Short Definition copied from bibo ontology + + http://purl.org/ontology/bibo/ - + A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers. - A written or printed work of fiction or nonfiction, usually on sheets of paper fastened or bound together within covers stable - + + + + + + @@ -5235,11 +5180,6 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - - - - - @@ -5249,36 +5189,36 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + + + + + + - - - - + + + + An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. An endeavor, frequently collaborative, that occurs over a finite period of time and is intended to achieve a particular aim. - - - + + + - + 1 - - - - - - - - - - 1 - + @@ -5286,22 +5226,27 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + + + + + + A URLLink that is designated (by the user or anyone else) as a primary link for the person, organization, event, etc. - - - - - @@ -5320,30 +5265,30 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik Note: Bibo:editor is used as the inverse of core:editorOf. Public Description for bibo:editor was obtained from here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . - - + + + + + + + + + + + - - - - - + A postdoctoral training appointment (job) - + 1 - - - - - - + @@ -5351,6 +5296,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + @@ -5373,6 +5323,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + http://www.fao.org/termportal/contr/zh/ http://www.fao.org/termportal/contr/es/ @@ -5391,6 +5346,21 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik + + + + + + + + + + + + + + + @@ -5398,10 +5368,10 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + - - + 1 + @@ -5431,6 +5401,26 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://www.fao.org/termportal/en/ 2010-06-24 + + + + + + + + + + + + + + + + + + + + @@ -5440,10 +5430,15 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik - + + + + + + 1 - + 2010-04-01 @@ -5455,6 +5450,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik http://unstats.un.org/unsd/methods/m49/m49alpha.htm http://unstats.un.org/unsd/methods/m49/m49alpha.htm + + + + + paraphrased editorial note from the bibo ontology: We are not defining, using an enumeration, the range of the bibo:status to be a defined list of bibo:DocumentStatus. This is because we want people to be able to define new statuses if needed; and creating such an enumeration would prevent this. @@ -5463,11 +5463,11 @@ Definition and description came from Wikipedia here: http://en.wikipedia.org/wik A list of items in a collection; an ordered compilation of item descriptions and sufficient information to afford access to them - NLM Catalog + + Short Definition is the Medical Subject Heading (MeSH) definition - From 251de7e02b3487b897a856e7957c601edb9ecbf2 Mon Sep 17 00:00:00 2001 From: mb863 Date: Wed, 9 Feb 2011 18:31:29 +0000 Subject: [PATCH 388/427] NIHVIVO-2086 Corrected the positioning of selected author box on author form --- .../edit/forms/css/addAuthorsToInformationResource.css | 3 ++- themes/wilma/css/wilma.css | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/productMods/edit/forms/css/addAuthorsToInformationResource.css b/productMods/edit/forms/css/addAuthorsToInformationResource.css index eeee752e..a8106be2 100644 --- a/productMods/edit/forms/css/addAuthorsToInformationResource.css +++ b/productMods/edit/forms/css/addAuthorsToInformationResource.css @@ -26,7 +26,8 @@ class, in case we want to re-enable DD without a page reload. */ margin-left: 2em; } form h3 { - margin-bottom: .5em; + margin-bottom: 0; + padding-bottom: 0; } form a:link.cancel, form a:visited.cancel, diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index c90e44d4..0452ccb6 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -120,6 +120,7 @@ input#submit:visited { line-height: 1; margin-right: .6em; margin-top: .5em; + margin-bottom: .5em; } input.delete, input.delete:visited, @@ -301,9 +302,9 @@ p.submit { } .formsEdit p { /*padding-top: 1em;*/ - margin-bottom: 1.8em; + margin-bottom: 1em; padding-bottom: 0; - margin-top: 1.2em; + margin-top: 0; } .formsEdit p.validationError { margin-bottom: 1.8em; From b63c4f2be7dd26390947d58cbb4ed7a1df81af6a Mon Sep 17 00:00:00 2001 From: mb863 Date: Wed, 9 Feb 2011 18:33:36 +0000 Subject: [PATCH 389/427] Made H2 consistent is size --- themes/wilma/css/wilma.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index 0452ccb6..c355887f 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -880,7 +880,7 @@ p{ background: #fff; } #menupage-intro h3 { - font-size: 1.5em; + font-size: 1.375em; color: #064d68; font-weight: normal; } From eb54a55efe05242925798498ec75b023e36b6e2b Mon Sep 17 00:00:00 2001 From: rjy7 Date: Wed, 9 Feb 2011 19:12:49 +0000 Subject: [PATCH 390/427] NIHVIVO-2082 Made two corrections in the hard-coded literals activity type query filter: a variable was incorrectly named, and some of the select values had spaces in them. Now the activity type query returns a result, which populates the type form field and allows the activity type and label to appear in the form. --- productMods/edit/forms/addClinicalRoleToPerson.jsp | 5 ++++- productMods/edit/forms/addHeadOfRoleToPerson.jsp | 6 +++--- productMods/edit/forms/addOutreachRoleToPerson.jsp | 6 +++--- productMods/edit/forms/addPresenterRoleToPerson.jsp | 5 ++++- productMods/edit/forms/addResearcherRoleToPerson.jsp | 5 ++++- productMods/edit/forms/addRoleToPersonTwoStage.jsp | 2 +- productMods/edit/forms/addServiceProviderRoleToPerson.jsp | 6 +++--- productMods/edit/forms/addTeacherRoleToPerson.jsp | 6 +++++- 8 files changed, 27 insertions(+), 14 deletions(-) diff --git a/productMods/edit/forms/addClinicalRoleToPerson.jsp b/productMods/edit/forms/addClinicalRoleToPerson.jsp index 7b7e5e90..2390270d 100644 --- a/productMods/edit/forms/addClinicalRoleToPerson.jsp +++ b/productMods/edit/forms/addClinicalRoleToPerson.jsp @@ -5,5 +5,8 @@ - + \ No newline at end of file diff --git a/productMods/edit/forms/addHeadOfRoleToPerson.jsp b/productMods/edit/forms/addHeadOfRoleToPerson.jsp index 2b1ef8a3..ce14f563 100644 --- a/productMods/edit/forms/addHeadOfRoleToPerson.jsp +++ b/productMods/edit/forms/addHeadOfRoleToPerson.jsp @@ -11,14 +11,14 @@ value='["", "Select one"], [ "http://vivoweb.org/ontology/core#Association", "Association" ], [ "http://vivoweb.org/ontology/core#Center", "Center" ], - [ "http://vivoweb.org/ontology/core#Clinical Organization", "Clinical Organization" ], + [ "http://vivoweb.org/ontology/core#ClinicalOrganization", "Clinical Organization" ], [ "http://vivoweb.org/ontology/core#College", "College" ], [ "http://vivoweb.org/ontology/core#Committee", "Committee" ], [ "http://vivoweb.org/ontology/core#Consortium", "Consortium" ], [ "http://vivoweb.org/ontology/core#Department", "Department" ], [ "http://vivoweb.org/ontology/core#Division", "Division" ], [ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ], - [ "http://vivoweb.org/ontology/core#Extension Unit", "Extension Unit" ], + [ "http://vivoweb.org/ontology/core#ExtensionUnit", "Extension Unit" ], [ "http://vivoweb.org/ontology/core#Foundation", "Foundation" ], [ "http://vivoweb.org/ontology/core#FundingOrganization", "Funding Organization" ], [ "http://vivoweb.org/ontology/core#GovernmentAgency", "Government Agency" ], @@ -36,6 +36,6 @@ [ "http://vivoweb.org/ontology/core#School", "School" ], [ "http://vivoweb.org/ontology/core#Service","Service"], [ "http://vivoweb.org/ontology/core#Team", "Team" ], - [ "http://vivoweb.org/ontology/core#Student Organization", "Student Organization" ], + [ "http://vivoweb.org/ontology/core#StudentOrganization", "Student Organization" ], [ "http://vivoweb.org/ontology/core#University", "University" ]' /> \ No newline at end of file diff --git a/productMods/edit/forms/addOutreachRoleToPerson.jsp b/productMods/edit/forms/addOutreachRoleToPerson.jsp index d8896b4f..0f309540 100644 --- a/productMods/edit/forms/addOutreachRoleToPerson.jsp +++ b/productMods/edit/forms/addOutreachRoleToPerson.jsp @@ -10,14 +10,14 @@ value='["", "Select one"], [ "http://vivoweb.org/ontology/core#Association", "Association" ], [ "http://vivoweb.org/ontology/core#Center", "Center" ], - [ "http://vivoweb.org/ontology/core#Clinical Organization", "Clinical Organization" ], + [ "http://vivoweb.org/ontology/core#ClinicalOrganization", "Clinical Organization" ], [ "http://vivoweb.org/ontology/core#College", "College" ], [ "http://vivoweb.org/ontology/core#Committee", "Committee" ], [ "http://vivoweb.org/ontology/core#Consortium", "Consortium" ], [ "http://vivoweb.org/ontology/core#Department", "Department" ], [ "http://vivoweb.org/ontology/core#Division", "Division" ], [ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ], - [ "http://vivoweb.org/ontology/core#Extension Unit", "Extension Unit" ], + [ "http://vivoweb.org/ontology/core#ExtensionUnit", "Extension Unit" ], [ "http://vivoweb.org/ontology/core#Foundation", "Foundation" ], [ "http://vivoweb.org/ontology/core#FundingOrganization", "Funding Organization" ], [ "http://vivoweb.org/ontology/core#GovernmentAgency", "Government Agency" ], @@ -35,6 +35,6 @@ [ "http://vivoweb.org/ontology/core#Team", "Team" ], [ "http://vivoweb.org/ontology/core#School", "School" ], [ "http://vivoweb.org/ontology/core#Service","Service"], - [ "http://vivoweb.org/ontology/core#Student Organization", "Student Organization" ], + [ "http://vivoweb.org/ontology/core#StudentOrganization", "Student Organization" ], [ "http://vivoweb.org/ontology/core#University", "University" ]' /> \ No newline at end of file diff --git a/productMods/edit/forms/addPresenterRoleToPerson.jsp b/productMods/edit/forms/addPresenterRoleToPerson.jsp index 3b29cc77..6bb02e92 100644 --- a/productMods/edit/forms/addPresenterRoleToPerson.jsp +++ b/productMods/edit/forms/addPresenterRoleToPerson.jsp @@ -8,5 +8,8 @@ - + \ No newline at end of file diff --git a/productMods/edit/forms/addResearcherRoleToPerson.jsp b/productMods/edit/forms/addResearcherRoleToPerson.jsp index e075311c..e7158f1e 100644 --- a/productMods/edit/forms/addResearcherRoleToPerson.jsp +++ b/productMods/edit/forms/addResearcherRoleToPerson.jsp @@ -6,5 +6,8 @@ - + \ No newline at end of file diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp index 858850dc..12cb02d8 100644 --- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp +++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp @@ -580,7 +580,7 @@ private String getActivityTypeQuery(VitroRequest vreq) { JSONArray option = values.getJSONArray(i); String uri = option.getString(0); if (StringUtils.isNotBlank(uri)) { - typeUris.add("(?existingTypeActivity = \"" + uri + "\")"); + typeUris.add("(?existingActivityType = <" + uri + ">)"); } } String typeFilters = "FILTER (" + StringUtils.join(typeUris, "||") + ")"; diff --git a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp index c483a58f..ccab85c6 100644 --- a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp +++ b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp @@ -10,14 +10,14 @@ value='["", "Select one"], [ "http://vivoweb.org/ontology/core#Association", "Association" ], [ "http://vivoweb.org/ontology/core#Center", "Center" ], - [ "http://vivoweb.org/ontology/core#Clinical Organization", "Clinical Organization" ], + [ "http://vivoweb.org/ontology/core#ClinicalOrganization", "Clinical Organization" ], [ "http://vivoweb.org/ontology/core#College", "College" ], [ "http://vivoweb.org/ontology/core#Committee", "Committee" ], [ "http://vivoweb.org/ontology/core#Consortium", "Consortium" ], [ "http://vivoweb.org/ontology/core#Department", "Department" ], [ "http://vivoweb.org/ontology/core#Division", "Division" ], [ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ], - [ "http://vivoweb.org/ontology/core#Extension Unit", "Extension Unit" ], + [ "http://vivoweb.org/ontology/core#ExtensionUnit", "Extension Unit" ], [ "http://vivoweb.org/ontology/core#Foundation", "Foundation" ], [ "http://vivoweb.org/ontology/core#FundingOrganization", "Funding Organization" ], [ "http://vivoweb.org/ontology/core#GovernmentAgency", "Government Agency" ], @@ -35,6 +35,6 @@ [ "http://vivoweb.org/ontology/core#Team", "Team" ], [ "http://vivoweb.org/ontology/core#School", "School" ], [ "http://vivoweb.org/ontology/core#Service","Service"], - [ "http://vivoweb.org/ontology/core#Student Organization", "Student Organization" ], + [ "http://vivoweb.org/ontology/core#StudentOrganization", "Student Organization" ], [ "http://vivoweb.org/ontology/core#University", "University" ]' /> \ No newline at end of file diff --git a/productMods/edit/forms/addTeacherRoleToPerson.jsp b/productMods/edit/forms/addTeacherRoleToPerson.jsp index adc333d1..75c1d7d7 100644 --- a/productMods/edit/forms/addTeacherRoleToPerson.jsp +++ b/productMods/edit/forms/addTeacherRoleToPerson.jsp @@ -6,5 +6,9 @@ - + \ No newline at end of file From 70ede78743455b63ed3354035cc2e430e88b3171 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Wed, 9 Feb 2011 19:36:48 +0000 Subject: [PATCH 391/427] --- .../CheckBrowseOptions.html | 2 +- .../VerifyAllThingsSearchable.html | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html index 74f2fa83..6cd17145 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html @@ -346,7 +346,7 @@ pause - 5000 + 10000 diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html index 3d7c32d2..c954af6d 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html @@ -164,11 +164,6 @@ Primate Heart Health Clinic - - verifyTextPresent - Primate Health and Fitness - - verifyTextPresent Introduction to Primate Health @@ -229,11 +224,6 @@ Jane Memorial Building - - verifyTextPresent - http://primatehealthintro.cornell.edu - - verifyTextPresent Elderly Care @@ -254,6 +244,16 @@ PHC Proceedings + + verifyTextPresent + Primate Health and Fitness + + + + verifyTextPresent + http://primatehealthintro.cornell.edu + + verifyTextPresent Faculty, Jane | Assistant Professor From 7cca04ef462e7b4de6a896148fb18b4c8b7830ac Mon Sep 17 00:00:00 2001 From: mb863 Date: Wed, 9 Feb 2011 20:13:25 +0000 Subject: [PATCH 392/427] Changed h3 headers to h2 in menupages, so they are consistent with h2 in home page. --- .../freemarker/body/menupage/menupage--classgroup-people.ftl | 2 +- themes/wilma/css/wilma.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/productMods/templates/freemarker/body/menupage/menupage--classgroup-people.ftl b/productMods/templates/freemarker/body/menupage/menupage--classgroup-people.ftl index 15927d96..db62e535 100644 --- a/productMods/templates/freemarker/body/menupage/menupage--classgroup-people.ftl +++ b/productMods/templates/freemarker/body/menupage/menupage--classgroup-people.ftl @@ -4,7 +4,7 @@ <#if !noData>