Auto-increments verses when no input is given.

timotheosh · Jun 29, 2015 · 48e61d6 · 48e61d6
1 parent 253df49
commit 48e61d6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -3,7 +3,7 @@ project(cbible)
 include_directories("/usr/include/sword")
 link_directories("/usr/lib")
 link_libraries(sword readline)
-set(gcc_cflags "-std=c++11")
+set(gcc_cflags "-g3 -std=c++11")
 set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${gcc_cflags}")
 set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${gcc_cflags}")
 add_executable(cbible SwordFuncs.cpp cbible.cpp)

diff --git a/src/SwordFuncs.cpp b/src/SwordFuncs.cpp
@@ -53,6 +53,7 @@ void SwordFuncs::SetModule(std::string module_name)
 {
   manager = new SWMgr(new MarkupFilterMgr(FMT_PLAIN));
   module = manager->getModule(module_name.c_str());
+  module->setKey(vkey);
 
   if (!module) {
     std::cout << listModules() << std::endl;
@@ -61,6 +62,22 @@ void SwordFuncs::SetModule(std::string module_name)
   }
 }
 
+std::string SwordFuncs::currentRef()
+{
+  if (vkey.isTraversable())
+    vkey++;
+
+  module->setKey(vkey);
+  std::string ret = "";
+
+  ret += std::to_string(vkey.getVerse());
+  ret += " ";
+  ret += module->RenderText();
+  ret += "\n";
+  ret += module->getKey()->getText();
+  return ret;
+}
+
 std::string SwordFuncs::parseInput(char * input)
 {
   std::string str = input;
@@ -71,6 +88,8 @@ std::string SwordFuncs::parseInput(char * input)
     SetModule(mod);
     return(mod);
   }
+  else if (str.empty())
+    return currentRef();
   else
     return lookup(str);
 }
@@ -93,7 +112,8 @@ std::string SwordFuncs::modname()
 std::string SwordFuncs::lookup(std::string ref)
 {
   std::string output = "";
-  //Module variables
+
+  // Set up module specific variables
   sword::VerseKey vk;
 
   //Variables related to splitting up the reference for iteration
@@ -113,6 +133,7 @@ std::string SwordFuncs::lookup(std::string ref)
     }
     output += "\n";
     output += module->getKey()->getRangeText();
+    vkey = module->getKey();
   }
   catch(const std::runtime_error& re)
   {

diff --git a/src/SwordFuncs.hpp b/src/SwordFuncs.hpp
@@ -30,6 +30,7 @@ class SwordFuncs
  private:
   sword::SWMgr *manager;
   sword::SWModule *module;
+  sword::VerseKey vkey;
   std::string mod_name;
 
   std::string listModules();
@@ -43,6 +44,7 @@ class SwordFuncs
   SwordFuncs();
   SwordFuncs(std::string);
   virtual ~SwordFuncs();
+  std::string currentRef();
   std::string modname();
   std::string parseInput(char * input);
   std::string lookup(std::string);

diff --git a/src/cbible.cpp b/src/cbible.cpp
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
   rl_bind_key('\t',rl_abort);  //disable auto-complete
 
   std::string prompt = "\n" + sw->modname() + " >> ";
-
+  std::cout << sw->parseInput(const_cast<char *>("Gen 1:1")) << std::endl;
   while((buf = readline(prompt.c_str()))!=NULL)
   {
     if ((strcmp(buf,"quit")==0) ||