Fix ppageno which should be zero-based and add minimal logic to handle incorrect 1-based ppageno

Author: manisandro

gtk/src/hocr/HOCRDocument.cc

@@ -1196,6 +1196,12 @@ HOCRPage::HOCRPage(const xmlpp::Element* element, int pageId, const Glib::ustrin
 		m_titleAttrs["ppageno"] = m_titleAttrs["pageno"];
 		m_titleAttrs.erase(m_titleAttrs.find("pageno"));
 	}
+	m_pageNr += 1;
+	// Hacky fix, at least for non-pdf sources, for older gImageReader versions which incorrectly stored one-based ppageno
+	if (!Utils::string_endswith(m_sourceFile.lowercase(), ".pdf") && m_pageNr != 1) {
+		m_pageNr = 1;
+	}
+
 	m_angle = std::atof(m_titleAttrs["rot"].c_str());
 	m_resolution = std::atoi(m_titleAttrs["scan_res"].c_str());
 	if (m_resolution == 0) {

gtk/src/hocr/OutputEditorHOCR.cc

@@ -277,7 +277,7 @@ void OutputEditorHOCR::HOCRBatchProcessor::appendOutput(std::ostream& dev, tesse
 	std::map<Glib::ustring, Glib::ustring> attrs = HOCRItem::deserializeAttrGroup(pageDiv->get_attribute_value("title"));
 	// This works because in batch mode the output is created next to the source image
 	attrs["image"] = Glib::ustring::compose("'%1'", Glib::path_get_basename(pageInfos.filename));
-	attrs["ppageno"] = Glib::ustring::compose("%1", pageInfos.page);
+	attrs["ppageno"] = Glib::ustring::compose("%1", pageInfos.page - 1);
 	attrs["rot"] = Glib::ustring::compose("%1", pageInfos.angle);
 	attrs["scan_res"] = Glib::ustring::compose("%1", pageInfos.resolution);
 	pageDiv->set_attribute("title", HOCRItem::serializeAttrGroup(attrs));
@@ -554,7 +554,7 @@ void OutputEditorHOCR::addPage(const Glib::ustring& hocrText, HOCRReadSessionDat
 	}
 	std::map<Glib::ustring, Glib::ustring> attrs = HOCRItem::deserializeAttrGroup(pageDiv->get_attribute_value("title"));
 	attrs["image"] = Glib::ustring::compose("'%1'", data.pageInfo.filename);
-	attrs["ppageno"] = Glib::ustring::compose("%1", data.pageInfo.page);
+	attrs["ppageno"] = Glib::ustring::compose("%1", data.pageInfo.page - 1);
 	attrs["rot"] = Glib::ustring::compose("%1", data.pageInfo.angle);
 	attrs["scan_res"] = Glib::ustring::compose("%1", data.pageInfo.resolution);
 	pageDiv->set_attribute("title", HOCRItem::serializeAttrGroup(attrs));

qt/src/hocr/HOCRDocument.cc

@@ -1064,13 +1064,19 @@ HOCRPage::HOCRPage(const QDomElement& element, int pageId, const QString& defaul
 	m_attrs["id"] = QString("page_%1").arg(pageId);
 
 	m_sourceFile = m_titleAttrs["image"].replace(QRegularExpression("^['\"]"), "").replace(QRegularExpression("['\"]$"), "");
-	m_pageNr = m_titleAttrs["ppageno"].toInt();
+	bool ok = false;
+	m_pageNr = m_titleAttrs["ppageno"].toInt(&ok);
 	// Code to handle pageno -> ppageno typo in previous versions of gImageReader
-	if (m_pageNr == 0) {
+	if (ok == false) {
 		m_pageNr = m_titleAttrs["pageno"].toInt();
 		m_titleAttrs["ppageno"] = m_titleAttrs["pageno"];
 		m_titleAttrs.remove("pageno");
 	}
+	m_pageNr += 1;
+	// Hacky fix, at least for non-pdf sources, for older gImageReader versions which incorrectly stored one-based ppageno
+	if (!m_sourceFile.endsWith(".pdf", Qt::CaseInsensitive) && m_pageNr != 1) {
+		m_pageNr = 1;
+	}
 	m_angle = m_titleAttrs["rot"].toDouble();
 	m_resolution = m_titleAttrs.value("scan_res", "100").toInt();
 

qt/src/hocr/OutputEditorHOCR.cc

@@ -267,7 +267,7 @@ void OutputEditorHOCR::HOCRBatchProcessor::appendOutput(QIODevice* dev, tesserac
 	QMap<QString, QString> attrs = HOCRItem::deserializeAttrGroup(pageDiv.attribute("title"));
 	// This works because in batch mode the output is created next to the source image
 	attrs["image"] = QString("'./%1'").arg(QFileInfo(pageInfos.filename).fileName());
-	attrs["ppageno"] = QString::number(pageInfos.page);
+	attrs["ppageno"] = QString::number(pageInfos.page - 1);
 	attrs["rot"] = QString::number(pageInfos.angle);
 	attrs["scan_res"] = QString::number(pageInfos.resolution);
 	pageDiv.setAttribute("title", HOCRItem::serializeAttrGroup(attrs));
@@ -436,7 +436,7 @@ void OutputEditorHOCR::addPage(const QString& hocrText, HOCRReadSessionData data
 	QDomElement pageDiv = doc.firstChildElement("div");
 	QMap<QString, QString> attrs = HOCRItem::deserializeAttrGroup(pageDiv.attribute("title"));
 	attrs["image"] = QString("'%1'").arg(data.pageInfo.filename);
-	attrs["ppageno"] = QString::number(data.pageInfo.page);
+	attrs["ppageno"] = QString::number(data.pageInfo.page - 1);
 	attrs["rot"] = QString::number(data.pageInfo.angle);
 	attrs["scan_res"] = QString::number(data.pageInfo.resolution);
 	pageDiv.setAttribute("title", HOCRItem::serializeAttrGroup(attrs));