--- mcore-src/trunk/mcore-tools/daemon/client/include/printing.client.class	2011/02/02 20:20:24	1248
+++ mcore-src/trunk/mcore-tools/daemon/client/include/printing.client.class	2011/02/04 20:02:42	1261
@@ -2,25 +2,32 @@
 
 provide lprng
 
-help_printing_addprinter()
+help_printing_printer()
 {
-	mecho "set printing.addprinter [name] [port] [ip] [share]"
-	mecho " adds a new printer"
+	mecho "get printing.printer"
+	mecho " Shows all configured printers."
+	mecho
+	mecho "set printing.addprinter [action] [name] [port] [ip] [share]"
+	mecho " Adds or deletes a printer."
+	mecho " Actions:"
+	mecho "   add   - adds given printer"
+	mecho "   del   - deletes given printer"
+	mecho
 	mecho "   name  - name of the printer"
 	mecho "   port  - printing port (lpt1, usb1, com1 ... lptN, usbN, comN"
 	mecho "   ip    - ip of the remote printer - optional"
 	mecho "   share - share/port name of the remote printer - optional"
 }
 
-set_printing_addprinter()
+helper_addprinter()
 {
 	local name="$1"
 	local port="$2"
 	local ip="$3"
 	local share="$4"
 
-	[[ -z ${name} ]] && help_printing_addprinter && return 1
-	[[ -z ${port} ]] && help_printing_addprinter && return 1
+	[[ -z ${name} ]] && help_printing_printer && return 1
+	[[ -z ${port} ]] && help_printing_printer && return 1
 
 	[[ ! -d /etc/printcap.d ]] && install -d /etc/printcap.d
 
@@ -41,17 +48,11 @@
 	helper_generate_printcap
 }
 
-help_printing_delprinter()
-{
-	mecho "set printing.delprinter [name]"
-	mecho " deletes given printer"
-}
-
-set_printing_delprinter()
+helper_delprinter()
 {
 	local name="$1"
 
-	[[ -z ${name} ]] && help_printing_addprinter && return 1
+	[[ -z ${name} ]] && help_printing_printer && return 1
 
 	if [[ -f /etc/printcap.d/${name}.conf ]]
 	then
@@ -67,10 +68,19 @@
 	helper_generate_printcap
 }
 
-help_printing_printer()
+set_printing_printer()
 {
-	mecho "get printing.printer"
-	mecho " shows all config/var/spool/lpd/ured printer"
+	local action="$1"
+	local name="$2"
+	local port="$3"
+	local ip="$4"
+	local share="$5"
+
+	case "${action}" in
+		add) helper_addprinter "${name}" "${port}" "${ip}" "${share}" ;;
+		del) helper_delprinter "${name}" ;;
+		*) help_printing_printer && return 1 ;;
+	esac
 }
 
 get_printing_printer()