Revision: 44726
http://brlcad.svn.sourceforge.net/brlcad/?rev=44726&view=rev
Author: davidloman
Date: 2011-06-02 16:09:19 +0000 (Thu, 02 Jun 2011)
Log Message:
-----------
Fix handling of GeoChunk. Was returning false instead of true. Removed debug
printing.
Modified Paths:
--------------
geomcore/trunk/src/GS/GSClient.cxx
Modified: geomcore/trunk/src/GS/GSClient.cxx
===================================================================
--- geomcore/trunk/src/GS/GSClient.cxx 2011-06-02 16:07:26 UTC (rev 44725)
+++ geomcore/trunk/src/GS/GSClient.cxx 2011-06-02 16:09:19 UTC (rev 44726)
@@ -154,46 +154,15 @@
ss << "Got manifest of " << man->getNumOfItems() << " items.";
log->logINFO("GSClient", ss.str());
- // build manifest & Chunks to send
- std::list<std::string>* items = man->getItemData();
- for (std::list<std::string>::iterator it = items->begin(); it
- != items->end(); it++)
- {
- str = *it;
- std::cout << " '" << str << ",\n";
- }
- std::cout << std::endl;
-
- log->logINFO("GSClient", ss.str());
-
- return false;
+ return true;
}
case GEOMETRYCHUNK:
{
GeometryChunkMsg* chunk = (GeometryChunkMsg*) msg;
- ByteBuffer* bb = chunk->getByteBuffer();
+ std::stringstream ss;
+ ss << "Processing chunk: " << chunk->getPath();
+ log->logINFO("GSClient", ss.str());
- /* Get object name */
- struct db5_raw_internal raw;
- if (db5_get_raw_internal_ptr(&raw, (const unsigned char *) bb->array())
- == NULL)
- {
- bu_log("Corrupted serialized geometry? Could not deserialize.\n");
- return false;
- }
-
- if (raw.name.ext_nbytes < 1)
- {
- bu_log("Failed to retrieve object name. Could not deserialize.\n");
- return false;
- }
-
- std::string name((char*) raw.name.ext_buf);
-
- if (name == "_GLOBAL")
- log->logINFO("GSClient", "Got a Chunk named: " + name);
-
- delete bb;
return true;
}
case DIRLISTREQ:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Discover what all the cheering's about.
Get your free trial download today.
http://p.sf.net/sfu/quest-dev2dev2
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
