nmg_mrsv command now accepts a model file name and checks the database

include/ged.h

@@ -1328,12 +1328,6 @@ GED_EXPORT extern int ged_nmg_fix_normals(struct ged *gedp, int argc, const char
  */
 GED_EXPORT extern int ged_nmg_simplify(struct ged *gedp, int argc, const char *argv[]);
 
-/**
- * Make Model. Creates a new NMG model structure and fills in the appropriate fields.
- * The result is an empty model.
- */
-GED_EXPORT extern int ged_nmg_mm(struct ged *gedp, int argc, const char *argv[]);
-
 /**
  * Make Model, Region. Creates a new model and creates a region within the model.
  * The region is empty.

src/libged/CMakeLists.txt

@@ -174,7 +174,6 @@ set(LIBGED_SOURCES
   nmg_mf.c
   nmg_ml.c
   nmg_mlv.c
-  nmg_mm.c
   nmg_mmr.c
   nmg_mrsv.c
   nmg_msv.c

src/libged/nmg_me.c

@@ -32,9 +32,10 @@
 
 #include "./ged_private.h"
 
-int ged_nmg_me(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_me(struct ged *gedp, int argc, const char *argv[])
 {
-	return 0;
+	return GED_ERROR;
 }
 
 /*

src/libged/nmg_meonvu.c

@@ -32,9 +32,10 @@
 
 #include "./ged_private.h"
 
-int ged_nmg_meonvu(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_meonvu(struct ged *gedp, int argc, const char *argv[])
 {
-	return 0;
+	return GED_ERROR;
 }
 
 /*

src/libged/nmg_mf.c

@@ -32,9 +32,10 @@
 
 #include "./ged_private.h"
 
-int ged_nmg_mf(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_mf(struct ged *gedp, int argc, const char *argv[])
 {
-	return 0;
+	return GED_ERROR;
 }
 
 /*

src/libged/nmg_ml.c

@@ -32,9 +32,10 @@
 
 #include "./ged_private.h"
 
-int ged_nmg_ml(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_ml(struct ged *gedp, int argc, const char *argv[])
 {
-	return 0;
+	return GED_ERROR;
 }
 
 /*

src/libged/nmg_mlv.c

@@ -32,9 +32,10 @@
 
 #include "./ged_private.h"
 
-int ged_nmg_mlv(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_mlv(struct ged *gedp, int argc, const char *argv[])
 {
-	return 0;
+	return GED_ERROR;
 }
 
 /*

src/libged/nmg_mmr.c

@@ -32,9 +32,10 @@
 
 #include "./ged_private.h"
 
-int ged_nmg_mmr(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_mmr(struct ged *gedp, int argc, const char *argv[])
 {
-	return 0;
+	return GED_ERROR;
 }
 
 /*

src/libged/nmg_mrsv.c

@@ -32,9 +32,49 @@
 
 #include "./ged_private.h"
 
-int ged_nmg_mrsv(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_mrsv(struct ged *gedp, int argc, const char *argv[])
 {
-	return 0;
+	struct rt_db_internal nmg_intern;
+	struct directory *dp;
+	const char *nmg_name;
+	struct model *m;
+	int ret = GED_ERROR;
+
+	static const char *usage = "nmg_name";
+
+	GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
+	GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+	GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR);
+
+	if (argc != 2) {
+    bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
+    return GED_HELP;
+    }
+
+	/* attempt to resolve and verify before we jump in */
+	nmg_name = argv[1];
+
+	if ((dp=db_lookup(gedp->ged_wdbp->dbip, nmg_name, LOOKUP_QUIET)) == RT_DIR_NULL) {
+    bu_vls_printf(gedp->ged_result_str, "%s does not exist\n", nmg_name);
+	return GED_ERROR;
+	}
+
+	if (rt_db_get_internal(&nmg_intern, dp, gedp->ged_wdbp->dbip, bn_mat_identity, &rt_uniresource) < 0) {
+    bu_vls_printf(gedp->ged_result_str, "rt_db_get_internal() error\n");
+	return GED_ERROR;
+	}
+
+	if (nmg_intern.idb_type != ID_NMG) {
+    bu_vls_printf(gedp->ged_result_str, "%s is not an NMG solid\n", nmg_name);
+	rt_db_free_internal(&nmg_intern);
+	return GED_ERROR;
+	}
+
+	m = (struct model *)nmg_intern.idb_ptr;
+	NMG_CK_MODEL(m);
+
+	return ret;
 }
 
 /*

src/libged/nmg_msv.c

@@ -32,9 +32,10 @@
 
 #include "./ged_private.h"
 
-int ged_nmg_msv(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_msv(struct ged *gedp, int argc, const char *argv[])
 {
-	return 0;
+	return GED_ERROR;
 }
 
 /*

src/libged/nmg_mvu.c

@@ -32,9 +32,10 @@
 
 #include "./ged_private.h"
 
-int ged_nmg_mvu(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_mvu(struct ged *gedp, int argc, const char *argv[])
 {
-	return 0;
+	return GED_ERROR;
 }
 
 /*

src/libged/nmg_mvvu.c

@@ -32,9 +32,10 @@
 
 #include "./ged_private.h"
 
-int ged_nmg_mvvu(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_mvvu(struct ged *gedp, int argc, const char *argv[])
 {
-	return 0;
+	return GED_ERROR;
 }
 
 /*

src/mged/setup.c

@@ -239,7 +239,6 @@ static struct cmdtab mged_cmdtab[] = {
     {"nmg_mf", cmd_ged_plain_wrapper, ged_nmg_mf},
     {"nmg_ml", cmd_ged_plain_wrapper, ged_nmg_ml},
     {"nmg_mlv", cmd_ged_plain_wrapper, ged_nmg_mlv},
-    {"nmg_mm", cmd_ged_plain_wrapper, ged_nmg_mm},
     {"nmg_mmr", cmd_ged_plain_wrapper, ged_nmg_mmr},
     {"nmg_mrsv", cmd_ged_plain_wrapper, ged_nmg_mrsv},
     {"nmg_msv", cmd_ged_plain_wrapper, ged_nmg_msv},