strlen and fix schema

Author: runette

source/pdal/pdalc_pipeline.cpp

@@ -118,7 +118,7 @@ extern "C"
                 std::string out = strm.str();
                 if (out.length() > size - 1) out.resize(size - 1);
                 std::strncpy(buffer, out.c_str(), size);
-                return std::min(out.length() + 1, size);
+                return strlen(out.c_str());
             }
             catch (const std::exception &e)
             {
@@ -146,7 +146,7 @@ extern "C"
                 std::string out = strm.str();
                 if (out.length() > size - 1) out.resize(size - 1);
                 std::strncpy(metadata, out.c_str(), size);
-                return std::min(out.length() + 1, size);
+                return strlen(out.c_str());
             }
             catch (const std::exception &e)
             {
@@ -165,14 +165,17 @@ extern "C"
 
             try
             {
+                if (! ptr->m_executed)
+                    throw pdal_error("Pipeline has not been executed!");
+                
                 std::stringstream strm;
                 MetadataNode meta = ptr->manager->pointTable().layout()->toMetadata();
                 MetadataNode root = meta.clone("schema");
                 pdal::Utils::toJSON(root, strm);
                 std::string out = strm.str();
                 if (out.length() > size - 1) out.resize(size - 1);
                 std::strncpy(schema, out.c_str(), size);
-                return std::min(out.length() + 1, size);
+                return strlen(out.c_str());
             }
             catch (const std::exception &e)
             {

tests/pdal/test_pdalc_pipeline.c.in

@@ -149,7 +149,7 @@ TEST testPDALGetPipelineAsString(void)
     char json10[10];
     size = PDALGetPipelineAsString(pipeline, json10, 10);
 
-    if (size != 10 )
+    if (size != 9 )
     {
         PDALDisposePipeline(pipeline);
         pipeline = NULL;
@@ -220,7 +220,7 @@ TEST testPDALGetPipelineMetadata(void)
     char json10[10];
     size = PDALGetPipelineMetadata(pipeline, json10, 10);
 
-    if (size != 10 )
+    if (size != 9 )
     {
         PDALDisposePipeline(pipeline);
         pipeline = NULL;
@@ -284,7 +284,7 @@ TEST testPDALGetPipelineSchema(void)
     char json10[10];
     size = PDALGetPipelineSchema(pipeline, json10, 10);
 
-    if (size != 10 )
+    if (size != 9 )
     {
         PDALDisposePipeline(pipeline);
         pipeline = NULL;