[sword-svn] r3024 - trunk/utilities/diatheke

[refdoc at crosswire.org]

Author: refdoc
Date: 2014-01-31 09:04:32 -0700 (Fri, 31 Jan 2014)
New Revision: 3024

Modified:
   trunk/utilities/diatheke/corediatheke.cpp
   trunk/utilities/diatheke/diatheke.cpp
Log:
improved bibliography output


Modified: trunk/utilities/diatheke/corediatheke.cpp
===================================================================
--- trunk/utilities/diatheke/corediatheke.cpp	2014-01-24 11:05:31 UTC (rev 3023)
+++ trunk/utilities/diatheke/corediatheke.cpp	2014-01-31 16:04:32 UTC (rev 3024)
@@ -65,6 +65,8 @@
 		descriptions = true;
 	}
 	else if (!::stricmp(key, "bibliography")) {
+		types = true;
+		names = true;
 		bibliography = true;
 	}
 	
@@ -75,7 +77,7 @@
 			target = it->second;
 			if (!strcmp(target->getType(), "Biblical Texts")) {
 				if (names) *output << target->getName();
-				if (names && descriptions) *output << " : ";
+				if (names && (descriptions || bibliography)) *output << " : ";
 				if (descriptions) *output << target->getDescription();
 				if (bibliography) *output << target->getBibliography();
 				*output << endl;
@@ -86,7 +88,7 @@
 			target = it->second;
 			if (!strcmp(target->getType(), "Commentaries")) {
 				if (names) *output << target->getName();
-				if (names && descriptions) *output << " : ";
+				if (names && (descriptions||bibliography)) *output << " : ";
 				if (descriptions) *output << target->getDescription();
 				if (bibliography) *output << target->getBibliography();
 				*output << endl;
@@ -97,7 +99,7 @@
 			target = it->second;
 			if (!strcmp(target->getType(), "Lexicons / Dictionaries")) {
 				if (names) *output << target->getName();
-				if (names && descriptions) *output << " : ";
+				if (names && (descriptions||bibliography)) *output << " : ";
 				if (descriptions) *output << target->getDescription();
 				if (bibliography) *output << target->getBibliography();
 				*output << endl;
@@ -108,7 +110,7 @@
 			target = it->second;
 			if (!strcmp(target->getType(), "Generic Books")) {
 				if (names) *output << target->getName();
-				if (names && descriptions) *output << " : ";
+				if (names && (descriptions||bibliography)) *output << " : ";
 				if (descriptions) *output << target->getDescription();
 				if (bibliography) *output << target->getBibliography();
 				*output << endl;

Modified: trunk/utilities/diatheke/diatheke.cpp
===================================================================
--- trunk/utilities/diatheke/diatheke.cpp	2014-01-24 11:05:31 UTC (rev 3023)
+++ trunk/utilities/diatheke/diatheke.cpp	2014-01-31 16:04:32 UTC (rev 3024)
@@ -47,7 +47,7 @@
 	fprintf (stderr, "    [-l locale] <-k query_key>\n");
 	fprintf (stderr, "\n");
 	fprintf (stderr, "If <book> is \"system\" you may use these system keys: \"modulelist\",\n");
-	fprintf (stderr, "\"modulelistnames\", and \"localelist\".");
+	fprintf (stderr, "\"modulelistnames\", \"bibliography\" and \"localelist\".");
 	fprintf (stderr, "\n");
 	fprintf (stderr, "Valid search_type values are: regex, multiword, and phrase(def).\n");
 	fprintf (stderr, "Valid option_filters values are: n (Strong's numbers),\n");