[brlcad-commits] SF.net SVN: brlcad:[44223] geomcore/trunk/src/libgvm

[<sta...@us...>]

Revision: 44223
          http://brlcad.svn.sourceforge.net/brlcad/?rev=44223&view=rev
Author:   starseeker
Date:     2011-04-05 17:52:21 +0000 (Tue, 05 Apr 2011)

Log Message:
-----------
move header entrys around, remove breakout.c (deal with that later)

Modified Paths:
--------------
    geomcore/trunk/src/libgvm/gvm.h

Removed Paths:
-------------
    geomcore/trunk/src/libgvm/breakout.c

Deleted: geomcore/trunk/src/libgvm/breakout.c
===================================================================
--- geomcore/trunk/src/libgvm/breakout.c	2011-04-05 17:46:19 UTC (rev 44222)
+++ geomcore/trunk/src/libgvm/breakout.c	2011-04-05 17:52:21 UTC (rev 44223)
@@ -1,83 +0,0 @@
-/*                     B R E A K O U T . C 
- * BRL-CAD
- *
- * Copyright (c) 2011 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @file breakout.c
- *
- *  Take a .g database and assign all of its individual components
- *  to a repository.
- */
-
-/* TODO - need a version of SVN_INT_ERROR that does what we want in a library 
- * - probably should not be returning something like EXIT_FAILURE*/
-
-/* This function deals with the special case of a .g file that does not
- * exist in the repository and needs all of its contents imported, without
- * any diff logic being applied. This function will not update an existing
- * .g model in the repository with new contents - for that use 
- * geomsvn_import_g_file */
-
-/* TODO - set SVN_PROP_REVISION_LOG via svn_fs_change_rev_prop to something like
- * "Initial import of model_name" - maybe SVN_PROP_REVISION_AUTHOR should be set
- * as well, if available. */
-int geomsvn_init_g_file(apr_pool_t *pool, const char *g_file, const char *repo_path) {
-	/* We're going to need an apr pool - if one was passed in, make the subpool
-	 * using it - otherwise start from scratch */
-	apr_pool_t *subpool;
-	apr_allocator_t *allocator;
-	if (pool) {
-		subpool = svn_pool_create(pool);
-	} else {
-		apr_allocator_create(&allocator);
-		apr_allocator_max_free_set(allocator, SVN_ALLOCATOR_RECOMMENDED_MAX_FREE);
-		subpool = svn_subpool_create_ex(NULL, allocator);
-		apr_allocator_owner_set(allocator, subpool);
-	}
-	{/* Now that we have a pool, set up the repository */
-	 svn_repos_t *repos;
-	 svn_fs_t *fs;
-	 svn_revnum_t youngest_rev;
-	 svn_fs_txn_t *txn;
-	 svn_fs_root_t *root, *txn_root;
-	 const char *repo_full_path = svn_path_canonicalize(repo_path, pool);
-	 if(!svn_repos_find_root_path(repo_full_path, pool)){
-		 printf("Repository %s does not exist.\n", repo_full_path);
-		 svn_pool_destroy(subpool);
-		 return -1;
-	 } else {
-		 const char *model_path = svn_path_canonicalize(g_file, pool);
-		 const char *model_name = svn_path_basename(model_path, pool);
-		 const svn_fs_id_t *node_id;
-		 svn_repos_open(&repos, repo_full_path, pool);
-		 fs = svn_repos_fs(repos);
-		 svn_fs_youngest_rev(&youngest_rev, fs, pool);
-		 svn_fs_revision_root(&root, fs, youngest_rev, pool);
-		 /* check if model already exists */
-		 status = svn_fs_node_id(&node_id, root, model_name, pool);
-		 if (status && status->apr_err == SVN_ERR_FS_NOT_FOUND) {
-			 /* good, it's not there - proceed */
-		 } else {
-			 printf("Model %s already exists in repository.\n", repo_full_path);
-			 svn_pool_destroy(subpool);
-			 return -1;
-		 }
-
-	 }
-	}
-}
-

Modified: geomcore/trunk/src/libgvm/gvm.h
===================================================================
--- geomcore/trunk/src/libgvm/gvm.h	2011-04-05 17:46:19 UTC (rev 44222)
+++ geomcore/trunk/src/libgvm/gvm.h	2011-04-05 17:52:21 UTC (rev 44223)
@@ -106,87 +106,8 @@
 		(struct gvm_info *repo_info, 
 		 const char *repo_path));
 
-/**
- * GVM .g file helper routines
- */ 
 
-/* Populate a new model repository using a .g file. */
-GVM_EXPORT GVM_EXTERN(int gvm_import_g_file,
-		(struct gvm_info *repo_info, 
-		 const char *g_file));
-
-/* List objects present in a .g file but not in the corresponding
- * model repository. */
-GVM_EXPORT GVM_EXTERN(int gvm_g_file_get_add_list,
-		(struct gvm_info *repo_info, 
-		 const char *g_file));
-
-/* List objects present in a model repository but not in the 
- * corresponding .g file. */
-GVM_EXPORT GVM_EXTERN(int gvm_g_file_get_delete_list,
-		(struct gvm_info *repo_info, 
-		 const char *g_file));
-
-/* List objects present in both a model repository and in the 
- * corresponding .g file that differ. */
-GVM_EXPORT GVM_EXTERN(int gvm_g_file_get_diff_list,
-		(struct gvm_info *repo_info, 
-		 const char *g_file));
-
-/* Update an existing model repository using a .g file. */
-GVM_EXPORT GVM_EXTERN(int gvm_commit_g_file,
-		(struct gvm_info *repo_info, 
-		 const char *g_file));
-
-/* Export a complete model repository to a .g file. If ver_num
- * is LATEST_VERSION use latest revision */
-GVM_EXPORT GVM_EXTERN(int gvm_export_g_file,
-		(struct gvm_info *repo_info,
-		 const char *model_name, 
-		 const char *g_file,
-		 size_t ver_num));
-
-/* Export a subset of a model repository to a .g file. If ver_num
- * is LATEST_VERSION use latest revision.  If recursive is 1 
- * recursivly include any objects int the tree below the specified
- * object. */
-GVM_EXPORT GVM_EXTERN(int gvm_export_object,
-		(struct gvm_info *repo_info,
-		 const char *model_name, 
-		 const char *obj_name, 
-		 const char *g_file,
-		 size_t ver_num,
-		 int recursive));
-
 /**
- * GVM model level routines
- */
-
-/* Add a new, empty model to a repository */
-GVM_EXPORT GVM_EXTERN(int gvm_new_model,
-	       (struct gvm_info *repo_info,
-		const char *model_name));
-
-/* Populate repo_info's objects list with the contents of
- * a complete model repository. If ver_num
- * is LATEST_VERSION use latest revision */
-GVM_EXPORT GVM_EXTERN(int gvm_get_model,
-		(struct gvm_info *repo_info,
-		 const char *model_name, 
-		 size_t ver_num));
-
-/* Populate repo_info's objects list with a  subset of a 
- * model repository. If ver_num is LATEST_VERSION use 
- * latest revision.  If recursive is 1 add all objects
- * below the specified object in the tree. */
-GVM_EXPORT GVM_EXTERN(int gvm_get_objs,
-		(struct gvm_info *repo_info,
-		 const char *model_name, 
-		 const char *obj_name, 
-		 size_t ver_num,
-		 int recursive));
-
-/**
  * GVM object level routines
  */
 
@@ -244,3 +165,87 @@
 GVM_EXPORT GVM_EXTERN(int gvm_commit_objs,
 	       (struct gvm_info *repo_info));
 
+
+/**
+ * GVM model level routines
+ */
+
+/* Add a new, empty model to a repository */
+GVM_EXPORT GVM_EXTERN(int gvm_new_model,
+	       (struct gvm_info *repo_info,
+		const char *model_name));
+
+/* Populate repo_info's objects list with the contents of
+ * a complete model repository. If ver_num
+ * is LATEST_VERSION use latest revision */
+GVM_EXPORT GVM_EXTERN(int gvm_get_model,
+		(struct gvm_info *repo_info,
+		 const char *model_name, 
+		 size_t ver_num));
+
+/* Populate repo_info's objects list with a  subset of a 
+ * model repository. If ver_num is LATEST_VERSION use 
+ * latest revision.  If recursive is 1 add all objects
+ * below the specified object in the tree. */
+GVM_EXPORT GVM_EXTERN(int gvm_get_objs,
+		(struct gvm_info *repo_info,
+		 const char *model_name, 
+		 const char *obj_name, 
+		 size_t ver_num,
+		 int recursive));
+
+
+
+/**
+ * GVM .g file helper routines
+ */ 
+
+/* Populate a new model repository using a .g file. */
+GVM_EXPORT GVM_EXTERN(int gvm_import_g_file,
+		(struct gvm_info *repo_info, 
+		 const char *g_file));
+
+/* List objects present in a .g file but not in the corresponding
+ * model repository. */
+GVM_EXPORT GVM_EXTERN(int gvm_g_file_get_add_list,
+		(struct gvm_info *repo_info, 
+		 const char *g_file));
+
+/* List objects present in a model repository but not in the 
+ * corresponding .g file. */
+GVM_EXPORT GVM_EXTERN(int gvm_g_file_get_delete_list,
+		(struct gvm_info *repo_info, 
+		 const char *g_file));
+
+/* List objects present in both a model repository and in the 
+ * corresponding .g file that differ. */
+GVM_EXPORT GVM_EXTERN(int gvm_g_file_get_diff_list,
+		(struct gvm_info *repo_info, 
+		 const char *g_file));
+
+/* Update an existing model repository using a .g file. */
+GVM_EXPORT GVM_EXTERN(int gvm_commit_g_file,
+		(struct gvm_info *repo_info, 
+		 const char *g_file));
+
+/* Export a complete model repository to a .g file. If ver_num
+ * is LATEST_VERSION use latest revision */
+GVM_EXPORT GVM_EXTERN(int gvm_export_g_file,
+		(struct gvm_info *repo_info,
+		 const char *model_name, 
+		 const char *g_file,
+		 size_t ver_num));
+
+/* Export a subset of a model repository to a .g file. If ver_num
+ * is LATEST_VERSION use latest revision.  If recursive is 1 
+ * recursivly include any objects int the tree below the specified
+ * object. */
+GVM_EXPORT GVM_EXTERN(int gvm_export_object,
+		(struct gvm_info *repo_info,
+		 const char *model_name, 
+		 const char *obj_name, 
+		 const char *g_file,
+		 size_t ver_num,
+		 int recursive));
+
+


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