[ZooLib-checkins] SF.net SVN: zoolib:[1842] trunk/zoolib/source/cxx/more/zoolib/dataspace

[<ag...@us...>]

Revision: 1842
          http://zoolib.svn.sourceforge.net/zoolib/?rev=1842&view=rev
Author:   agreen
Date:     2011-01-02 00:44:35 +0000 (Sun, 02 Jan 2011)

Log Message:
-----------
Some cleanup.

Modified Paths:
--------------
    trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Dataset.cpp
    trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Dataset.h
    trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp

Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Dataset.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Dataset.cpp	2011-01-02 00:43:36 UTC (rev 1841)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Dataset.cpp	2011-01-02 00:44:35 UTC (rev 1842)
@@ -218,6 +218,12 @@
 #pragma mark -
 #pragma mark * Source_Dataset
 
+void Source_Dataset::ForceUpdate()
+	{
+	fStackChanged = true;
+	this->pInvokeCallable_ResultsAvailable();
+	}
+
 Source_Dataset::Source_Dataset(ZRef<Dataset> iDataset)
 :	fDataset(iDataset)
 ,	fEvent(Event::sZero())
@@ -331,12 +337,6 @@
 void Source_Dataset::Erase(const Daton& iDaton)
 	{ this->pModify(iDaton, sAsVal(iDaton), false); }
 
-void Source_Dataset::Insert(const ZVal_Any& iVal)
-	{ this->pModify(sAsDaton(iVal), iVal, true); }
-
-void Source_Dataset::Erase(const ZVal_Any& iVal)
-	{ this->pModify(sAsDaton(iVal), iVal, false); }
-
 size_t Source_Dataset::OpenTransaction()
 	{
 	fStackChanged = true;

Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Dataset.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Dataset.h	2011-01-02 00:43:36 UTC (rev 1841)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Dataset.h	2011-01-02 00:44:35 UTC (rev 1842)
@@ -63,6 +63,8 @@
 	{
 public:
 	enum { kDebug = 1 };
+	
+	void ForceUpdate();
 
 	// Some kind of index specs to be passed in too.
 	Source_Dataset(ZRef<ZDataset::Dataset> iDataset);
@@ -82,9 +84,6 @@
 	void Insert(const ZDataset::Daton& iDaton);
 	void Erase(const ZDataset::Daton& iDaton);
 
-	void Insert(const ZVal_Any& iVal);
-	void Erase(const ZVal_Any& iVal);
-
 	size_t OpenTransaction();
 	void ClearTransaction(size_t iIndex);
 	void CloseTransaction(size_t iIndex);

Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp	2011-01-02 00:43:36 UTC (rev 1841)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp	2011-01-02 00:44:35 UTC (rev 1842)
@@ -693,8 +693,9 @@
 				{
 				s << "Raw, then analyzed:\n";
 				ZRA::Util_Strim_Rel::sToStrim(thePSearch->fRel, s);
-				s << "\n\n";
+				s << "\n--------------------\n";
 				ZRA::Util_Strim_Rel::sToStrim(thePSearch->fRel_Analyzed, s);
+				s << "\n--------------------";
 				}
 			}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.