[Webnotes-cvs] webnotes/core note_api.php,1.9,1.10 page_api.php,1.5,1.6

[<vb...@us...>]

Update of /cvsroot/webnotes/webnotes/core
In directory usw-pr-cvs1:/tmp/cvs-serv16718/core

Modified Files:
	note_api.php page_api.php 
Log Message:
Clean up work in core/page_api.php

Index: note_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/note_api.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- note_api.php	10 Sep 2002 04:28:11 -0000	1.9
+++ note_api.php	10 Sep 2002 10:34:14 -0000	1.10
@@ -212,7 +212,7 @@
 	function print_web_notes( $p_file, $p_url ) {
 		echo '<br />';
 
-		$t_page_id = get_page_id( $p_file );
+		$t_page_id = page_get_id( $p_file );
 		if ( $t_page_id === '' ) {
 			theme_not_indexed( $p_page, $p_url );
 		} else {

Index: page_api.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/core/page_api.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- page_api.php	10 Sep 2002 04:28:11 -0000	1.5
+++ page_api.php	10 Sep 2002 10:34:14 -0000	1.6
@@ -10,7 +10,7 @@
 	# --------------------------------------------------------
 
 	### --------------------
-	function get_page_id( $p_file ) {
+	function page_get_id( $p_file ) {
 		global $g_phpWN_page_table;
 
 		$c_file = db_prepare_string( $p_file );
@@ -28,6 +28,10 @@
 		return false;
 	}
 	### --------------------
+	function page_is_indexed( $p_file ) {
+		return ( false !== page_get_id( $p_file ) );
+	}
+	### --------------------
 	function page_visible_notes_count( $p_page_id ) {
 		global $g_phpWN_note_table;
 
@@ -35,19 +39,31 @@
 
 		$query = "SELECT COUNT(*)
 				FROM $g_phpWN_note_table
+				WHERE page_id=$c_page_id AND visible=1";
+		$result = db_query( $query );
+		return db_result( $result, 0, 0 );
+	}
+	### --------------------
+	function page_notes_count( $p_page_id ) {
+		global $g_phpWN_note_table;
+
+		$c_page_id = db_prepare_int( $p_page_id );
+
+		$query = "SELECT COUNT(*)
+				FROM $g_phpWN_note_table
 				WHERE page_id=$c_page_id";
 		$result = db_query( $query );
 		return db_result( $result, 0, 0 );
 	}
 	### --------------------
-	function get_page_name( $p_id ) {
+	function page_get_name( $p_page_id ) {
 		global $g_phpWN_page_table;
 
-		$c_id = db_prepare_int( $p_id );
+		$c_page_id = db_prepare_int( $p_page_id );
 
 		$query = "SELECT page
 				FROM $g_phpWN_page_table
-				WHERE id='$c_id'
+				WHERE id='$c_page_id'
 				LIMIT 1";
 
 		$result = db_query( $query );
@@ -77,9 +93,9 @@
 		closedir( $handle );
 	}
 	### --------------------
-	function add_file( $p_page_name ) {
+	function page_add( $p_page_name ) {
 		# if page already exists, return to avoid duplicates
-		if ( get_page_id( $p_page_name ) !== false ) {
+		if ( page_get_id( $p_page_name ) !== false ) {
 		    return 0;
 		}
 
@@ -97,7 +113,7 @@
 		return $result;
 	}
 	### --------------------
-	function index_files( $p_path='', $p_recursive=true ) {
+	function page_add_dir( $p_path='', $p_recursive=true ) {
 		$dirs = array();
 		$files = array();
 
@@ -119,7 +135,7 @@
 
 		foreach ( $files as $file ) {
 			$t_filename = $p_path . $file;
-			if ( add_file( $t_filename ) ) {
+			if ( page_add( $t_filename ) ) {
 				echo "$t_filename<br />";
 			}
 		}
@@ -130,8 +146,25 @@
 		}
 
 		foreach ( $dirs as $dir ) {
-			index_files( $p_path . $dir . DIRECTORY_SEPARATOR );
+			page_add_dir( $p_path . $dir . DIRECTORY_SEPARATOR );
 		}
+	}
+	### --------------------
+	function page_delete( $p_page_id ) {
+		global $g_phpWN_page_table;
+
+		$c_page_id = db_prepare_int( $p_page_id );
+
+		$query = "DELETE FROM $g_phpWN_page_table
+				WHERE id='$c_page_id'
+				LIMIT 1";
+
+		$result = db_query( $query );
+		if ( db_num_rows( $result) > 0 ) {
+			return true;
+		}
+
+		return false;
 	}
 	### --------------------
 ?>