yaclf

lib/KOReaderSync/ChapterXPathForwardMapper.cpp

@@ -1,15 +1,15 @@
 #include "ChapterXPathForwardMapper.h"
 
-#include "ChapterXPathIndexerInternal.h"
-#include "ChapterXPathIndexerState.h"
-
 #include <HalStorage.h>
 #include <Logging.h>
 #include <expat.h>
 
 #include <algorithm>
-#include <unordered_map>
 #include <string>
+#include <unordered_map>
+
+#include "ChapterXPathIndexerInternal.h"
+#include "ChapterXPathIndexerState.h"
 
 namespace ChapterXPathIndexerInternal {
 

lib/KOReaderSync/ChapterXPathIndexer.cpp

@@ -1,9 +1,5 @@
 #include "ChapterXPathIndexer.h"
 
-#include "ChapterXPathForwardMapper.h"
-#include "ChapterXPathIndexerInternal.h"
-#include "ChapterXPathReverseMapper.h"
-
 #include <Logging.h>
 
 #include <cctype>
@@ -11,6 +7,10 @@
 #include <limits>
 #include <string>
 
+#include "ChapterXPathForwardMapper.h"
+#include "ChapterXPathIndexerInternal.h"
+#include "ChapterXPathReverseMapper.h"
+
 using namespace ChapterXPathIndexerInternal;
 
 // Public facade used by ProgressMapper. It intentionally stays thin and delegates

lib/KOReaderSync/ChapterXPathIndexerState.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "ChapterXPathIndexerInternal.h"
-
 #include <string>
 #include <unordered_map>
 #include <vector>
 
+#include "ChapterXPathIndexerInternal.h"
+
 namespace ChapterXPathIndexerInternal {
 
 // Shared parser state used by both forward and reverse mappers.

lib/KOReaderSync/ChapterXPathReverseMapper.cpp

@@ -1,8 +1,5 @@
 #include "ChapterXPathReverseMapper.h"
 
-#include "ChapterXPathIndexerInternal.h"
-#include "ChapterXPathIndexerState.h"
-
 #include <HalStorage.h>
 #include <Logging.h>
 #include <expat.h>
@@ -11,6 +8,9 @@
 #include <cstdlib>
 #include <string>
 
+#include "ChapterXPathIndexerInternal.h"
+#include "ChapterXPathIndexerState.h"
+
 namespace ChapterXPathIndexerInternal {
 
 namespace {
@@ -225,8 +225,8 @@ bool findProgressForXPathInternal(const std::shared_ptr<Epub>& epub, const int s
     outIntraSpineProgress = std::max(0.0f, std::min(1.0f, outIntraSpineProgress));
   }
 
-  LOG_DBG("KOX", "Reverse: spine=%d %s match offset=%zu/%zu -> progress=%.3f for '%s'", spineIndex,
+  LOG_DBG("KOX", "Reverse: spine=%d %s match offset=%zu/%zu -> progress=%.3f for '%s'", spineIndex, state.bestTierName,
-          state.bestTierName, state.bestOffset, state.totalTextBytes, outIntraSpineProgress, xpath.c_str());
+          state.bestOffset, state.totalTextBytes, outIntraSpineProgress, xpath.c_str());
   return true;
 }