Changing from _SCITE- to _SCITE as sobj marker

SemanticMediaWiki · Nov 29, 2015 · 5cd1e9a · 5cd1e9a
1 parent a620fb0
commit 5cd1e9a
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/src/SciteParserFunction.php b/src/SciteParserFunction.php
@@ -244,7 +244,7 @@ private function tryToMatchCitationTextByPrecept( ParserParameterProcessor $pars
 	private function addPropertyValuesFor( ParserParameterProcessor $parserParameterProcessor, $reference ) {
 
 		$subobject = new Subobject( $this->parserData->getTitle() );
-		$subobject->setEmptyContainerForId( '_SCITE-' . md5( $reference ) );
+		$subobject->setEmptyContainerForId( '_SCITE' . md5( $reference ) );
 
 		$subject = $this->parserData->getSemanticData()->getSubject();
 

diff --git a/tests/phpunit/Integration/Parser/Fixtures/scite-01-simple-intext-reference.json b/tests/phpunit/Integration/Parser/Fixtures/scite-01-simple-intext-reference.json
@@ -24,13 +24,13 @@
 					"strict-mode-valuematch": false,
 					"propertyCount": 3,
 					"propertyKeys": [ "__sci_cite", "_MDAT", "_SKEY" ],
-					"propertyValues": [ "Citation/Resource#_SCITE-86f84b9b2cf2ae4405199e26f121b4e9" ]
+					"propertyValues": [ "Citation/Resource#_SCITE86f84b9b2cf2ae4405199e26f121b4e9" ]
 				}
 			}
 		},
 		{
 			"about": "#1 verify citation resource container",
-			"subject": "Citation/Resource#_SCITE-86f84b9b2cf2ae4405199e26f121b4e9",
+			"subject": "Citation/Resource#_SCITE86f84b9b2cf2ae4405199e26f121b4e9",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,

diff --git a/tests/phpunit/Integration/Parser/Fixtures/scite-02-multiple-intext-references.json b/tests/phpunit/Integration/Parser/Fixtures/scite-02-multiple-intext-references.json
@@ -18,7 +18,7 @@
 	"parser-testcases": [
 		{
 			"about": "#0",
-			"subject": "Citation/Resource/1#_SCITE-86f84b9b2cf2ae4405199e26f121b4e9",
+			"subject": "Citation/Resource/1#_SCITE86f84b9b2cf2ae4405199e26f121b4e9",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,
@@ -30,7 +30,7 @@
 		},
 		{
 			"about": "#1",
-			"subject": "Citation/Resource/2#_SCITE-93a83f3f4f27770cf5084f131206bb3b",
+			"subject": "Citation/Resource/2#_SCITE93a83f3f4f27770cf5084f131206bb3b",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,

diff --git a/tests/phpunit/Integration/Parser/Fixtures/scite-03-use-property-definition.json b/tests/phpunit/Integration/Parser/Fixtures/scite-03-use-property-definition.json
@@ -34,13 +34,13 @@
 					"strict-mode-valuematch": false,
 					"propertyCount": 3,
 					"propertyKeys": [ "__sci_cite", "_MDAT", "_SKEY" ],
-					"propertyValues": [ "Citation/Resource/3#_SCITE-86f84b9b2cf2ae4405199e26f121b4e9" ]
+					"propertyValues": [ "Citation/Resource/3#_SCITE86f84b9b2cf2ae4405199e26f121b4e9" ]
 				}
 			}
 		},
 		{
 			"about": "#1 verify citation resource container",
-			"subject": "Citation/Resource/3#_SCITE-86f84b9b2cf2ae4405199e26f121b4e9",
+			"subject": "Citation/Resource/3#_SCITE86f84b9b2cf2ae4405199e26f121b4e9",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,

diff --git a/tests/phpunit/Integration/Parser/Fixtures/scite-04-use-template-definition.json b/tests/phpunit/Integration/Parser/Fixtures/scite-04-use-template-definition.json
@@ -35,13 +35,13 @@
 					"strict-mode-valuematch": false,
 					"propertyCount": 3,
 					"propertyKeys": [ "__sci_cite", "_MDAT", "_SKEY" ],
-					"propertyValues": [ "Citation/Resource/1#_SCITE-86f84b9b2cf2ae4405199e26f121b4e9" ]
+					"propertyValues": [ "Citation/Resource/1#_SCITE86f84b9b2cf2ae4405199e26f121b4e9" ]
 				}
 			}
 		},
 		{
 			"about": "#1 citation text determined by type-template mapping",
-			"subject": "Citation/Resource/1#_SCITE-86f84b9b2cf2ae4405199e26f121b4e9",
+			"subject": "Citation/Resource/1#_SCITE86f84b9b2cf2ae4405199e26f121b4e9",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,
@@ -59,13 +59,13 @@
 					"strict-mode-valuematch": false,
 					"propertyCount": 3,
 					"propertyKeys": [ "__sci_cite", "_MDAT", "_SKEY" ],
-					"propertyValues": [ "Citation/Resource/2#_SCITE-0c2129948fae0ce94908235dd949ea00" ]
+					"propertyValues": [ "Citation/Resource/2#_SCITE0c2129948fae0ce94908235dd949ea00" ]
 				}
 			}
 		},
 		{
 			"about": "#3 citation text determined by direct template assignment",
-			"subject": "Citation/Resource/2#_SCITE-0c2129948fae0ce94908235dd949ea00",
+			"subject": "Citation/Resource/2#_SCITE0c2129948fae0ce94908235dd949ea00",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,

diff --git a/tests/phpunit/Integration/Parser/Fixtures/scite-10-reference-with-sortkey.json b/tests/phpunit/Integration/Parser/Fixtures/scite-10-reference-with-sortkey.json
@@ -10,7 +10,7 @@
 	"parser-testcases": [
 		{
 			"about": "#0",
-			"subject": "Citation/Resource#_SCITE-86f84b9b2cf2ae4405199e26f121b4e9",
+			"subject": "Citation/Resource#_SCITE86f84b9b2cf2ae4405199e26f121b4e9",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,

diff --git a/tests/phpunit/Integration/Parser/Fixtures/scite-12-fixed-property-annotation.json b/tests/phpunit/Integration/Parser/Fixtures/scite-12-fixed-property-annotation.json
@@ -26,7 +26,7 @@
 	"parser-testcases": [
 		{
 			"about": "#0 DOI url annotation",
-			"subject": "Example/12/1#_SCITE-86f84b9b2cf2ae4405199e26f121b4e9",
+			"subject": "Example/12/1#_SCITE86f84b9b2cf2ae4405199e26f121b4e9",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,
@@ -38,7 +38,7 @@
 		},
 		{
 			"about": "#1 DOI short annotation",
-			"subject": "Example/12/1#_SCITE-86f84b9b2cf2ae4405199e26f121b4e9",
+			"subject": "Example/12/1#_SCITE86f84b9b2cf2ae4405199e26f121b4e9",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,
@@ -50,7 +50,7 @@
 		},
 		{
 			"about": "#2 OCLC/VIAF annotation",
-			"subject": "Example/12/3#_SCITE-86f84b9b2cf2ae4405199e26f121b4e9",
+			"subject": "Example/12/3#_SCITE86f84b9b2cf2ae4405199e26f121b4e9",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,
@@ -62,7 +62,7 @@
 		},
 		{
 			"about": "#3 PMID/PMCID annotation",
-			"subject": "Example/12/4#_SCITE-86f84b9b2cf2ae4405199e26f121b4e9",
+			"subject": "Example/12/4#_SCITE86f84b9b2cf2ae4405199e26f121b4e9",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,
@@ -74,7 +74,7 @@
 		},
 		{
 			"about": "#4 OLID annotation",
-			"subject": "Example/12/5#_SCITE-86f84b9b2cf2ae4405199e26f121b4e9",
+			"subject": "Example/12/5#_SCITE86f84b9b2cf2ae4405199e26f121b4e9",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,

diff --git a/tests/phpunit/Integration/Parser/Fixtures/scite-13-bibtex-record-mapping.json b/tests/phpunit/Integration/Parser/Fixtures/scite-13-bibtex-record-mapping.json
@@ -69,13 +69,13 @@
 					"strict-mode-valuematch": false,
 					"propertyCount": 3,
 					"propertyKeys": [ "__sci_cite", "_MDAT", "_SKEY" ],
-					"propertyValues": [ "Example/12/1#_SCITE-7a0c0a939e8181da78d3ebe6cf09eeca" ]
+					"propertyValues": [ "Example/12/1#_SCITE7a0c0a939e8181da78d3ebe6cf09eeca" ]
 				}
 			}
 		},
 		{
 			"about": "#1",
-			"subject": "Example/12/1#_SCITE-7a0c0a939e8181da78d3ebe6cf09eeca",
+			"subject": "Example/12/1#_SCITE7a0c0a939e8181da78d3ebe6cf09eeca",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,
@@ -87,7 +87,7 @@
 		},
 		{
 			"about": "#2 with separated authors",
-			"subject": "Example/12/2#_SCITE-b9a7caa631427c26f4c8e70219b2cda9",
+			"subject": "Example/12/2#_SCITEb9a7caa631427c26f4c8e70219b2cda9",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,
@@ -99,7 +99,7 @@
 		},
 		{
 			"about": "#3 explicit reference/type precedes",
-			"subject": "Example/12/3#_SCITE-99250259e6747c8f1c3876637a69d68c",
+			"subject": "Example/12/3#_SCITE99250259e6747c8f1c3876637a69d68c",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,
@@ -111,7 +111,7 @@
 		},
 		{
 			"about": "#4 access hidden bibtex-author, see #12",
-			"subject": "Example/12/4#_SCITE-b375bde01f73d04037215f4614f81cc1",
+			"subject": "Example/12/4#_SCITEb375bde01f73d04037215f4614f81cc1",
 			"store": {
 				"semantic-data": {
 					"strict-mode-valuematch": false,