[LON-CAPA-cvs] cvs: rat / lonpage.pm lonwrapper.pm

[www]

www		Mon Nov  7 20:06:29 2011 EDT

  Modified files:              
    /rat	lonpage.pm lonwrapper.pm 
  Log:
  Trying to get rid of some of the copy/paste regular expressions
  
  
Index: rat/lonpage.pm
diff -u rat/lonpage.pm:1.96 rat/lonpage.pm:1.97
--- rat/lonpage.pm:1.96	Thu Jul 28 03:14:09 2011
+++ rat/lonpage.pm	Mon Nov  7 20:06:29 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.96 2011/07/28 03:14:09 raeburn Exp $
+# $Id: lonpage.pm,v 1.97 2011/11/07 20:06:29 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -608,7 +608,7 @@
 	'" target="LONcatInfo">'.
 	'<img src="/adm/lonMisc/eval_button.png" class="LC_icon" />'.
 	'</a>';
-    if (($hash->{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) &&
+    if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) &&
 	($hash->{'src_'.$rid} !~ m-^/uploaded/-)) {
 
 	if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
Index: rat/lonwrapper.pm
diff -u rat/lonwrapper.pm:1.40 rat/lonwrapper.pm:1.41
--- rat/lonwrapper.pm:1.40	Mon Jan  3 14:19:41 2011
+++ rat/lonwrapper.pm	Mon Nov  7 20:06:29 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.40 2011/01/03 14:19:41 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.41 2011/11/07 20:06:29 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -85,7 +85,7 @@
 #
 # Actual URL
 #
-    if ($url=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+    if ($url=~/$LONCAPA::assess_re/) {
 #
 # This is uploaded homework
 #