Merge pull request #1070 from kermitt2/bugfix/fix-coord-name-title

kermitt2 · web-flow · commit 4b77e73956f6 · 2023-12-21T17:35:36.000+01:00
correct &lt;title&gt; coordinates attribute name
diff --git a/grobid-core/src/main/java/org/grobid/core/data/BiblioItem.java b/grobid-core/src/main/java/org/grobid/core/data/BiblioItem.java
@@ -2263,7 +2263,7 @@ public String toTEI(int n, int indent, GrobidAnalysisConfig config) {
                         if (titleTokens != null && titleTokens.size()>0) {
                             String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                             if (coords != null && coords.length()>0) {
-                                tei.append(" coord=\"" + coords + "\"");
+                                tei.append(" coords=\"" + coords + "\"");
                             }
                         } 
                     }
@@ -2276,7 +2276,7 @@ public String toTEI(int n, int indent, GrobidAnalysisConfig config) {
                         if (titleTokens != null && titleTokens.size()>0) {
                             String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                             if (coords != null && coords.length()>0) {
-                                tei.append(" coord=\"" + coords + "\"");
+                                tei.append(" coords=\"" + coords + "\"");
                             }
                         } 
                     }
@@ -2426,7 +2426,7 @@ else if (bookTitle == null) {
                     if (titleTokens != null && titleTokens.size()>0) {
                         String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                         if (coords != null && coords.length()>0) {
-                            tei.append(" coord=\"" + coords + "\"");
+                            tei.append(" coords=\"" + coords + "\"");
                         }
                     } 
                 }
@@ -2450,7 +2450,7 @@ else if (bookTitle == null) {
                         if (titleTokens != null && titleTokens.size()>0) {
                             String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                             if (coords != null && coords.length()>0) {
-                                tei.append(" coord=\"" + coords + "\"");
+                                tei.append(" coords=\"" + coords + "\"");
                             }
                         } 
                     }
@@ -2682,7 +2682,7 @@ else if (this.getYear().length() == 4)
                         if (titleTokens != null && titleTokens.size()>0) {
                             String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                             if (coords != null && coords.length()>0) {
-                                tei.append(" coord=\"" + coords + "\"");
+                                tei.append(" coords=\"" + coords + "\"");
                             }
                         } 
                     }
@@ -2709,7 +2709,7 @@ else if (this.getYear().length() == 4)
                         if (titleTokens != null && titleTokens.size()>0) {
                             String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                             if (coords != null && coords.length()>0) {
-                                tei.append(" coord=\"" + coords + "\"");
+                                tei.append(" coords=\"" + coords + "\"");
                             }
                         } 
                     }
@@ -3791,7 +3791,7 @@ private void appendAffiliation(
             List<LayoutToken> affTokens = aff.getLayoutTokens();
             String coords = LayoutTokensUtil.getCoordsString(affTokens);
             if (coords != null && coords.length()>0) {
-                tei.append(" coord=\"" + coords + "\"");
+                tei.append(" coords=\"" + coords + "\"");
             }
         }
         tei.append(">\n");
diff --git a/grobid-core/src/main/java/org/grobid/core/document/TEIFormatter.java b/grobid-core/src/main/java/org/grobid/core/document/TEIFormatter.java
@@ -154,7 +154,7 @@ public StringBuilder toTEIHeader(BiblioItem biblio,
             if (titleTokens != null && titleTokens.size()>0) {
                 String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                 if (coords != null) {
-                    tei.append(" coord=\"" + coords + "\"");
+                    tei.append(" coords=\"" + coords + "\"");
                 }
             }
         }
@@ -394,7 +394,7 @@ else if (biblio.getE_Year().length() == 4)
                 if (titleTokens != null && titleTokens.size()>0) {
                     String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                     if (coords != null) {
-                        tei.append(" coord=\"" + coords + "\"");
+                        tei.append(" coords=\"" + coords + "\"");
                     }
                 }
             }
diff --git a/grobid-core/src/main/java/org/grobid/core/engines/ProcessEngine.java b/grobid-core/src/main/java/org/grobid/core/engines/ProcessEngine.java
@@ -137,7 +137,7 @@ public void processFullText(final GrobidMainArgs pGbdArgs) throws Exception {
         } else {
             List<String> elementCoordinates = null;
             if (pGbdArgs.getTeiCoordinates()) {
-                elementCoordinates = Arrays.asList("figure", "persName", "ref", "biblStruct", "formula", "s", "note");
+                elementCoordinates = Arrays.asList("figure", "persName", "ref", "biblStruct", "formula", "s", "note", "title", "head");
             }
             processFullTextDirectory(files, pGbdArgs, pGbdArgs.getPath2Output(), pGbdArgs.getSaveAssets(), 
                 elementCoordinates, pGbdArgs.getSegmentSentences(), pGbdArgs.getAddElementId());
diff --git a/grobid-service/src/main/resources/web/grobid/grobid.js b/grobid-service/src/main/resources/web/grobid/grobid.js
@@ -13,7 +13,7 @@ var grobid = (function($) {
 
 	var block = 0;
 
-    var elementCoords = ['s', 'biblStruct', 'persName', 'figure', 'formula', 'head', 'note'];
+    var elementCoords = ['s', 'biblStruct', 'persName', 'figure', 'formula', 'head', 'note', 'title'];
 
 	function defineBaseURL(ext) {
 		var baseUrl = null;

Original file line number	Diff line number	Diff line change
`@@ -2263,7 +2263,7 @@ public String toTEI(int n, int indent, GrobidAnalysisConfig config) {`
`2263`	`2263`	`if (titleTokens != null && titleTokens.size()>0) {`
`2264`	`2264`	`String coords = LayoutTokensUtil.getCoordsString(titleTokens);`
`2265`	`2265`	`if (coords != null && coords.length()>0) {`
`2266`		`- tei.append(" coord=\"" + coords + "\"");`
	`2266`	`+ tei.append(" coords=\"" + coords + "\"");`
`2267`	`2267`	`}`
`2268`	`2268`	`}`
`2269`	`2269`	`}`
`@@ -2276,7 +2276,7 @@ public String toTEI(int n, int indent, GrobidAnalysisConfig config) {`
`2276`	`2276`	`if (titleTokens != null && titleTokens.size()>0) {`
`2277`	`2277`	`String coords = LayoutTokensUtil.getCoordsString(titleTokens);`
`2278`	`2278`	`if (coords != null && coords.length()>0) {`
`2279`		`- tei.append(" coord=\"" + coords + "\"");`
	`2279`	`+ tei.append(" coords=\"" + coords + "\"");`
`2280`	`2280`	`}`
`2281`	`2281`	`}`
`2282`	`2282`	`}`
`@@ -2426,7 +2426,7 @@ else if (bookTitle == null) {`
`2426`	`2426`	`if (titleTokens != null && titleTokens.size()>0) {`
`2427`	`2427`	`String coords = LayoutTokensUtil.getCoordsString(titleTokens);`
`2428`	`2428`	`if (coords != null && coords.length()>0) {`
`2429`		`- tei.append(" coord=\"" + coords + "\"");`
	`2429`	`+ tei.append(" coords=\"" + coords + "\"");`
`2430`	`2430`	`}`
`2431`	`2431`	`}`
`2432`	`2432`	`}`
`@@ -2450,7 +2450,7 @@ else if (bookTitle == null) {`
`2450`	`2450`	`if (titleTokens != null && titleTokens.size()>0) {`
`2451`	`2451`	`String coords = LayoutTokensUtil.getCoordsString(titleTokens);`
`2452`	`2452`	`if (coords != null && coords.length()>0) {`
`2453`		`- tei.append(" coord=\"" + coords + "\"");`
	`2453`	`+ tei.append(" coords=\"" + coords + "\"");`
`2454`	`2454`	`}`
`2455`	`2455`	`}`
`2456`	`2456`	`}`
`@@ -2682,7 +2682,7 @@ else if (this.getYear().length() == 4)`
`2682`	`2682`	`if (titleTokens != null && titleTokens.size()>0) {`
`2683`	`2683`	`String coords = LayoutTokensUtil.getCoordsString(titleTokens);`
`2684`	`2684`	`if (coords != null && coords.length()>0) {`
`2685`		`- tei.append(" coord=\"" + coords + "\"");`
	`2685`	`+ tei.append(" coords=\"" + coords + "\"");`
`2686`	`2686`	`}`
`2687`	`2687`	`}`
`2688`	`2688`	`}`
`@@ -2709,7 +2709,7 @@ else if (this.getYear().length() == 4)`
`2709`	`2709`	`if (titleTokens != null && titleTokens.size()>0) {`
`2710`	`2710`	`String coords = LayoutTokensUtil.getCoordsString(titleTokens);`
`2711`	`2711`	`if (coords != null && coords.length()>0) {`
`2712`		`- tei.append(" coord=\"" + coords + "\"");`
	`2712`	`+ tei.append(" coords=\"" + coords + "\"");`
`2713`	`2713`	`}`
`2714`	`2714`	`}`
`2715`	`2715`	`}`
`@@ -3791,7 +3791,7 @@ private void appendAffiliation(`
`3791`	`3791`	`List<LayoutToken> affTokens = aff.getLayoutTokens();`
`3792`	`3792`	`String coords = LayoutTokensUtil.getCoordsString(affTokens);`
`3793`	`3793`	`if (coords != null && coords.length()>0) {`
`3794`		`- tei.append(" coord=\"" + coords + "\"");`
	`3794`	`+ tei.append(" coords=\"" + coords + "\"");`
`3795`	`3795`	`}`
`3796`	`3796`	`}`
`3797`	`3797`	`tei.append(">\n");`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public StringBuilder toTEIHeader(BiblioItem biblio,`
`154`	`154`	`if (titleTokens != null && titleTokens.size()>0) {`
`155`	`155`	`String coords = LayoutTokensUtil.getCoordsString(titleTokens);`
`156`	`156`	`if (coords != null) {`
`157`		`- tei.append(" coord=\"" + coords + "\"");`
	`157`	`+ tei.append(" coords=\"" + coords + "\"");`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`	`}`
`@@ -394,7 +394,7 @@ else if (biblio.getE_Year().length() == 4)`
`394`	`394`	`if (titleTokens != null && titleTokens.size()>0) {`
`395`	`395`	`String coords = LayoutTokensUtil.getCoordsString(titleTokens);`
`396`	`396`	`if (coords != null) {`
`397`		`- tei.append(" coord=\"" + coords + "\"");`
	`397`	`+ tei.append(" coords=\"" + coords + "\"");`
`398`	`398`	`}`
`399`	`399`	`}`
`400`	`400`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public void processFullText(final GrobidMainArgs pGbdArgs) throws Exception {`
`137`	`137`	`} else {`
`138`	`138`	`List<String> elementCoordinates = null;`
`139`	`139`	`if (pGbdArgs.getTeiCoordinates()) {`
`140`		`- elementCoordinates = Arrays.asList("figure", "persName", "ref", "biblStruct", "formula", "s", "note");`
	`140`	`+ elementCoordinates = Arrays.asList("figure", "persName", "ref", "biblStruct", "formula", "s", "note", "title", "head");`
`141`	`141`	`}`
`142`	`142`	`processFullTextDirectory(files, pGbdArgs, pGbdArgs.getPath2Output(), pGbdArgs.getSaveAssets(),`
`143`	`143`	`elementCoordinates, pGbdArgs.getSegmentSentences(), pGbdArgs.getAddElementId());`