v0.6.2-965, fixed compilation without Redland

Author: andreas-steigmiller

Konclude-VS15.vcproj

@@ -150,7 +150,7 @@ For MacOS, the Redland RDF Libraries are currently not integrated/tested, i.e.,
 # CHANGELOG
 
 
-- Konclude v0.6.2-964 (pre-release):
+- Konclude v0.6.2-965 (pre-release):
     - Support of more SPARQL features (e.g., OPTIONAL, UNION, FILTER, aggregates, etc.) via Redland Rasqal.
     - Several bug fixes.
 

Konclude-VS15.vcxproj

@@ -1143,6 +1143,7 @@ namespace Konclude {
 
 										QList<CQuery*> queryList = gQDKBRUC->getQueryList();
 										for (CQuery* query : queryList) {
+#ifdef KONCLUDE_REDLAND_INTEGRATION
 											CRedlandRasqalBGPsCompositionQuery* rrcq = dynamic_cast<CRedlandRasqalBGPsCompositionQuery*>(query);
 											if (rrcq) {
 												QList<CKnowledgeBaseRevisionCommandProvider*> kbProviderList;
@@ -1155,6 +1156,7 @@ namespace Konclude {
 												CInstallQueryDependentKnowledgeBaseRevisionUpdatesCommand* insKBRUC = new CInstallQueryDependentKnowledgeBaseRevisionUpdatesCommand(kbProviderList, query, gQDKBRUC);
 												preSynchronizer->delegateCommand(insKBRUC);
 											}
+#endif // KONCLUDE_REDLAND_INTEGRATION
 										}
 
 										CStopProcessCommandRecord::makeRecord(&commandRecordRouter);
@@ -1166,6 +1168,7 @@ namespace Konclude {
 										CInstallQueryDependentKnowledgeBaseRevisionUpdatesCommand *iQDKBRUC = (CInstallQueryDependentKnowledgeBaseRevisionUpdatesCommand*)command;
 
 										CQuery* query = iQDKBRUC->getQuery();
+#ifdef KONCLUDE_REDLAND_INTEGRATION
 										CRedlandRasqalBGPsCompositionQuery* rrcq = dynamic_cast<CRedlandRasqalBGPsCompositionQuery*>(query);
 										if (rrcq) {
 											QList<CKnowledgeBaseRevisionCommandProvider*>* kbRCPList = iQDKBRUC->getDependentKnowledgeBasesProviderCommandList();
@@ -1178,6 +1181,7 @@ namespace Konclude {
 												}
 											}
 										}
+#endif // KONCLUDE_REDLAND_INTEGRATION
 
 										CStopProcessCommandRecord::makeRecord(&commandRecordRouter);
 										CFinishProcessCommandRecord::makeRecord(&commandRecordRouter);

Readme.md

@@ -93,6 +93,7 @@ namespace Konclude {
 							}
 						}
 
+#ifdef KONCLUDE_REDLAND_INTEGRATION
 						CRedlandRasqalBGPsCompositionQuery* redRasqQuery = dynamic_cast<CRedlandRasqalBGPsCompositionQuery*>(mQuery);
 						if (redRasqQuery) {
 							const QString& queryText = redRasqQuery->getQueryText();
@@ -104,6 +105,7 @@ namespace Konclude {
 								redRasqQuery->setQueryResult(mStreamingResult);
 							}
 						}
+#endif // KONCLUDE_REDLAND_INTEGRATION
 
 					}
 					return mQuery;

Source/Control/Interface/OWLlink/COWLlinkProcessor.cpp

@@ -17,6 +17,7 @@
  *		License along with Konclude. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#ifdef KONCLUDE_REDLAND_INTEGRATION
 
 #include "CComplexQueryCompositionRedlandRasqalProcessingData.h"
 
@@ -149,3 +150,5 @@ namespace Konclude {
 	}; // end namespace Reasoner
 
 }; // end namespace Konclude
+
+#endif // KONCLUDE_REDLAND_INTEGRATION

Source/Control/Interface/SPARQL/CSPARQLResultStreamingData.cpp

@@ -17,6 +17,7 @@
  *		License along with Konclude. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#ifdef KONCLUDE_REDLAND_INTEGRATION
 
 #ifndef KONCLUDE_REASONER_ANSWERER_CCOMPLEXQUERYCOMPOSITIONREDLANDRASQALPROCESSINGDATA_H
 #define KONCLUDE_REASONER_ANSWERER_CCOMPLEXQUERYCOMPOSITIONREDLANDRASQALPROCESSINGDATA_H
@@ -152,3 +153,5 @@ namespace Konclude {
 }; // end namespace Konclude
 
 #endif // KONCLUDE_REASONER_ANSWERER_CCOMPLEXQUERYCOMPOSITIONREDLANDRASQALPROCESSINGDATA_H
+
+#endif // KONCLUDE_REDLAND_INTEGRATION

Source/Reasoner/Answerer/CComplexQueryCompositionRedlandRasqalProcessingData.cpp

@@ -52,7 +52,7 @@ namespace Konclude {
 #ifdef KONCLUDE_REDLAND_INTEGRATION
 					answeringHandler = new COptimizedComplexCompositionRedlandRasqalAnsweringHandler(ontoAnsweringItem);
 #else
-					answeringHandler = new COptimizedComplexCompositionAnsweringHandler(ontoAnsweringItem);
+					answeringHandler = nullptr;
 #endif // KONCLUDE_REDLAND_INTEGRATION
 				}
 				return answeringHandler;

Source/Reasoner/Answerer/CComplexQueryCompositionRedlandRasqalProcessingData.h

@@ -85,7 +85,7 @@ namespace Konclude {
 				TDependentOntologyPair depOntPair = mDependentKnowledgeBaseRevisionHash.value(kbName);
 				return depOntPair.second;
 			}
-
+			
 
 		}; // end namespace Query
 

Source/Reasoner/Answerer/CConfigurationAnsweringHandlerFactory.cpp

@@ -1,3 +1,3 @@
-#define KONCLUDE_VERSION_GIT_REVISION_NUMBER 964
+#define KONCLUDE_VERSION_GIT_REVISION_NUMBER 965
 #define KONCLUDE_VERSION_GIT_TAG_NAME_STRING "v0.6.2"
-#define KONCLUDE_VERSION_GIT_REVISION_HASH_STRING "eb60d0dd"
+#define KONCLUDE_VERSION_GIT_REVISION_HASH_STRING "fa20b125"