adapted to libfolia API change

LanguageMachines · Mar 8, 2016 · 9bf79dc · 9bf79dc
1 parent 9565785
commit 9bf79dc
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 22 deletions.
diff --git a/src/FoLiA-alto.cxx b/src/FoLiA-alto.cxx
@@ -195,7 +195,7 @@ void addStr( folia::Paragraph *par, string& txt,
     // OK that's what we hoped for
     folia::KWargs args;
     args["id"] = par->id() + "." + atts["ID"];
-    folia::String *s = new folia::String( par->doc(), args );
+    folia::String *s = new folia::String( args, par->doc() );
     par->append( s );
     s->settext( content , txt.length(), classname );
     txt += " " + content;
@@ -210,7 +210,7 @@ void addStr( folia::Paragraph *par, string& txt,
     for ( size_t i=0; i < parts.size(); ++i ){
       folia::KWargs args;
       args["id"] = par->id() + "." + atts["ID"] + "_" + TiCC::toString(i);
-      folia::String *s = new folia::String( par->doc(), args );
+      folia::String *s = new folia::String( args, par->doc() );
       par->append( s );
       s->settext( parts[i], txt.length(), classname );
       txt += " " + parts[i];
@@ -248,8 +248,8 @@ void createFile( folia::FoliaElement *text,
       ids.insert(id);
     }
     folia::Paragraph *p =
-      new folia::Paragraph( text->doc(),
-			    folia::getArgs("id='" + text->id() + ".p." + altoFile + "." + id + "'" ) );
+      new folia::Paragraph( folia::getArgs("id='" + text->id() + ".p." + altoFile + "." + id + "'" ),
+			     text->doc() );
     text->append( p );
     string ocr_text;
     list<xmlNode*> v =
@@ -276,7 +276,7 @@ void createFile( folia::FoliaElement *text,
 		  folia::KWargs args;
 		  args["id"] = p->id() + "." + atts["ID"];
 		  args["class"] = classname;
-		  folia::String *s = new folia::String( text->doc(), args );
+		  folia::String *s = new folia::String( args, text->doc() );
 		  p->append( s );
 		  s->settext( atts["SUBS_CONTENT"], ocr_text.length(),
 			      classname );
@@ -940,8 +940,8 @@ void solveBook( const string& altoFile, const string& id,
 	ids.insert(id);
       }
       folia::Paragraph *p =
-	new folia::Paragraph( text->doc(),
-			      folia::getArgs("id='" + text->id() + ".p." + id + "'" ) );
+	new folia::Paragraph( folia::getArgs("id='" + text->id() + ".p." + id + "'" ),
+			      text->doc() );
       text->append( p );
       string ocr_text;
       list<xmlNode*> v =
@@ -968,7 +968,7 @@ void solveBook( const string& altoFile, const string& id,
 		    folia::KWargs args;
 		    args["id"] = p->id() + "." + atts["ID"];
 		    args["class"] = classname;
-		    folia::String *s = new folia::String( text->doc(), args );
+		    folia::String *s = new folia::String( args, text->doc() );
 		    p->append( s );
 		    s->settext( atts["SUBS_CONTENT"], ocr_text.length(),
 				classname );

diff --git a/src/FoLiA-hocr.cxx b/src/FoLiA-hocr.cxx
@@ -139,8 +139,8 @@ void processParagraphs( xmlNode *div, folia::FoliaElement *out, const string& fi
   while ( pit != pars.end() ){
     string p_id = TiCC::getAttribute( *pit, "id" );
     folia::Paragraph *par
-      = new folia::Paragraph( out->doc(),
-			      folia::getArgs( "id='" + out->id() + "." + p_id + "'" ) );
+      = new folia::Paragraph( folia::getArgs( "id='" + out->id() + "." + p_id + "'" ),
+			      out->doc() );
     list<xmlNode*> lines = TiCC::FindNodes( *pit, ".//span[@class='ocr_line']" );
     if ( lines.size() == 0 ){
 #pragma omp critical
@@ -170,8 +170,8 @@ void processParagraphs( xmlNode *div, folia::FoliaElement *out, const string& fi
 	string content = extractContent( *it );
 	content = TiCC::trim( content );
 	if ( !content.empty() ){
-	  folia::String *str = new folia::String( out->doc(),
-						  folia::getArgs( "id='" + par->id()  + "." + w_id + "'" ) );
+	  folia::String *str = new folia::String( folia::getArgs( "id='" + par->id()  + "." + w_id + "'" ),
+						   out->doc() );
 	  par->append( str );
 	  str->settext( content, txt.length(), classname );
 	  txt += " " + content;

diff --git a/src/FoLiA-page.cxx b/src/FoLiA-page.cxx
@@ -86,9 +86,9 @@ void appendStr( folia::FoliaElement *par, int& pos,
 		const string& val, const string& id,
 		const string& file ){
   if ( !val.empty() ){
-    folia::String *str = new folia::String( par->doc(),
-					    folia::getArgs( "id='" + par->id()
-							    + "." + id + "'" ) );
+    folia::String *str = new folia::String( folia::getArgs( "id='" + par->id()
+							    + "." + id + "'" ),
+					     par->doc() );
     par->append( str );
     str->settext( val, pos, classname );
     pos += val.length();
@@ -114,8 +114,7 @@ void process( folia::FoliaElement *out,
 	parTxt += " ";
     }
     folia::Paragraph *par
-      = new folia::Paragraph( out->doc(),
-			      folia::getArgs( "id='" + out->id() + "." + refs[i] + "'" ));
+      = new folia::Paragraph( folia::getArgs( "id='" + out->id() + "." + refs[i] + "'" ),  out->doc() );
     par->settext( parTxt, classname );
     out->append( par );
     int pos = 0;
@@ -142,8 +141,7 @@ void process( folia::FoliaElement *out,
 	parTxt += " ";
     }
     folia::Paragraph *par
-      = new folia::Paragraph( out->doc(),
-			      folia::getArgs( "id='" + out->id() + "." + labels.at(it->first) + "'") );
+      = new folia::Paragraph( folia::getArgs( "id='" + out->id() + "." + labels.at(it->first) + "'"), out->doc() );
     par->settext( parTxt, classname );
     out->append( par );
     int pos = 0;

diff --git a/src/FoLiA-txt.cxx b/src/FoLiA-txt.cxx
@@ -168,7 +168,7 @@ int main( int argc, char *argv[] ){
     }
     d->declare( folia::AnnotationType::STRING, setname,
 		"annotator='FoLiA-txt', datetime='now()'" );
-    folia::Text *text = new folia::Text( d, folia::getArgs("id='" + docid + ".text'") );
+    folia::Text *text = new folia::Text( folia::getArgs("id='" + docid + ".text'"), d );
     d->addText( text );
     int parCount = 0;
     int wrdCnt = 0;
@@ -195,7 +195,7 @@ int main( int argc, char *argv[] ){
 	  folia::KWargs args;
 	  parId = docid + ".p." +  TiCC::toString(++parCount);
 	  args["id"] = parId;
-	  par = new folia::Paragraph( d, args );
+	  par = new folia::Paragraph( args, d );
 	  wrdCnt = 0;
 	}
 	string content = words[i];
@@ -204,7 +204,7 @@ int main( int argc, char *argv[] ){
 	if ( !content.empty() ){
 	  folia::KWargs args;
 	  args["id"] = parId + ".str." +  TiCC::toString(++wrdCnt);
-	  folia::FoliaElement *str = new folia::String( d, args );
+	  folia::FoliaElement *str = new folia::String( args, d );
 	  str->settext( content, classname );
 	  parTxt += " " + content;
 	  par->append( str );