--- loncom/build/lpml_parse.pl	2001/11/17 21:30:28	1.20
+++ loncom/build/lpml_parse.pl	2001/11/17 23:00:10	1.21
@@ -6,9 +6,9 @@
 # 06/19/2001,06/20,06/24 - Scott Harrison
 # 9/5/2001,9/6,9/7,9/8 - Scott Harrison
 # 9/17,9/18 - Scott Harrison
-# 11/4,11/5,11/6,11/7,11/16 - Scott Harrison
+# 11/4,11/5,11/6,11/7,11/16,11/17 - Scott Harrison
 #
-# $Id: lpml_parse.pl,v 1.20 2001/11/17 21:30:28 harris41 Exp $
+# $Id: lpml_parse.pl,v 1.21 2001/11/17 23:00:10 harris41 Exp $
 ###
 
 ###############################################################################
@@ -799,14 +799,16 @@ $buildtest	\@if !(test -e "${sourceroot}
 		echo "**** ERROR **** CVS source file does not exist: ${sourceroot}/${source} and neither does target: ${targetroot}/${target}"$logcmd; \\
 	elif !(test -e "${sourceroot}/${source}"); then \\
 		echo "**** WARNING **** CVS source file does not exist: ${sourceroot}/${source}"$logcmd; \\
+		perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$logcmd; \\
 	else \\
 		ECODE=0; \\
 		perl filecompare.pl $bflag ${sourceroot}/${source} ${targetroot}/${target} || ECODE=\$\$?; \\
 		case "\$\$ECODE" in \\
 			1) echo "${targetroot}/${target} is unchanged";; \\
-			2) echo "**** WARNING **** target file ${targetroot}/${target} is newer than CVS source; creating ${targetroot}/${target}.lpmlnewfile instead"$logcmd && install -o www -g www -m 0500 ${sourceroot}/${source} ${targetroot}/${target}.lpmlnewfile;; \\
-			0) echo "install -o www -g www -m 0500 ${sourceroot}/${source} ${targetroot}/${target}" && install -o www -g www -m 0500 ${sourceroot}/${source} ${targetroot}/${target};; \\
+			2) echo "**** WARNING **** target file ${targetroot}/${target} is newer than CVS source; saving current (old) target file to ${targetroot}/${target}.lpmlsave and then overwriting"$logcmd && install -o www -g www -m 0600 ${targetroot}/${target} ${targetroot}/${target}.lpmlsave && install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
+			0) echo "install $categoryhash{$categorname} ${sourceroot}/${source} ${targetroot}/${target}" && install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
 		esac; \\
+		perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$logcmd; \\
 	fi
 END
 #	    return "\t".'@test -e '.$sourceroot.'/'.$source.
@@ -829,12 +831,12 @@ END
 		'{ [ $$ECODE != "2" ] || (install '.
                 $categoryhash{$categoryname}.' '.
 		$sourceroot.'/'.$source.' '.
-		$targetroot.'/'.$target.'.lpmlnewconf'.
+		$targetroot.'/'.$target.'.lpmlnew'.
 		' && echo "**** NOTE: CONFIGURATION FILE CHANGE ****"'.
 		$logcmd.' && echo "'.
 		'You likely need to compare contents of '.
 		''.$targetroot.'/'.$target.' with the new '.
-                ''.$targetroot.'/'.$target.'.lpmlnewconf"'.
+                ''.$targetroot.'/'.$target.'.lpmlnew"'.
 		"$logcmd); } && ".
 		'{ [ $$ECODE != "3" ] || (install '.
                 $categoryhash{$categoryname}.' '.