A few uncommitted updates to reduce the debug messages. Parsing fix for Florida.

git-svn-id: svn://t2.unl.edu/brian/XrdCmsTfc@4189 1fda6f16-4416-0410-bfd6-867a04880151

Author: brian

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for xrootd-cmstfc 1.4.
+# Generated by GNU Autoconf 2.59 for xrootd-cmstfc 1.4.2.
 #
 # Report bugs to <[email protected]>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xrootd-cmstfc'
 PACKAGE_TARNAME='xrootd-cmstfc'
-PACKAGE_VERSION='1.4'
-PACKAGE_STRING='xrootd-cmstfc 1.4'
+PACKAGE_VERSION='1.4.2'
+PACKAGE_STRING='xrootd-cmstfc 1.4.2'
 PACKAGE_BUGREPORT='[email protected]'
 
 ac_unique_file="src/XrdCmsTfc.hh"
@@ -954,7 +954,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xrootd-cmstfc 1.4 to adapt to many kinds of systems.
+\`configure' configures xrootd-cmstfc 1.4.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1020,7 +1020,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xrootd-cmstfc 1.4:";;
+     short | recursive ) echo "Configuration of xrootd-cmstfc 1.4.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1161,7 +1161,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-xrootd-cmstfc configure 1.4
+xrootd-cmstfc configure 1.4.2
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1175,7 +1175,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xrootd-cmstfc $as_me 1.4, which was
+It was created by xrootd-cmstfc $as_me 1.4.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -3178,7 +3178,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xrootd-cmstfc'
- VERSION='1.4'
+ VERSION='1.4.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -19318,7 +19318,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by xrootd-cmstfc $as_me 1.4, which was
+This file was extended by xrootd-cmstfc $as_me 1.4.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19376,7 +19376,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-xrootd-cmstfc config.status 1.4
+xrootd-cmstfc config.status 1.4.2
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

@@ -1,6 +1,6 @@
 
 AC_PREREQ(2.57)
-AC_INIT(xrootd-cmstfc,1.4,[email protected])
+AC_INIT(xrootd-cmstfc,1.4.2,[email protected])
 AC_CONFIG_SRCDIR([src/XrdCmsTfc.hh])
 
 AC_PROG_CXX

spec/xrootd-cmstfc.spec

@@ -1,6 +1,6 @@
 
 Name: xrootd-cmstfc
-Version: 1.4
+Version: 1.4.2
 Release: 1
 Summary: CMS TFC plugin for xrootd
 

src/XrdCmsTfc.cc

@@ -311,9 +311,10 @@ XrdCmsTfc::TrivialFileCatalog::lfn2pfn(const char *lfn, char *buff, int blen)
          protocol != m_protocols.end();
          protocol++) 
     {    
-        tmpLfn = applyRules(m_directRules, *protocol, m_destination, false, tmpLfn);
+        tmpLfn = applyRules(m_directRules, *protocol, m_destination, true, tmpLfn);
         if (!tmpLfn.empty()) {
             strncpy(buff, tmpLfn.c_str(), blen);
+            eDest->Say("Resulting PFN: ", buff);
             return 0;
         }
     }   
@@ -353,7 +354,7 @@ std::string replaceWithRegexp (const int ovector[OVECCOUNT], const int rc,
 		   const std::string inputString,
 		   const std::string outputFormat)
 {
-    std::cerr << "InputString:" << inputString << std::endl;
+    //std::cerr << "InputString:" << inputString << std::endl;
 
     char buffer[8];
     std::string result = outputFormat;
@@ -381,7 +382,7 @@ std::string replaceWithRegexp (const int ovector[OVECCOUNT], const int rc,
             pcre_free(substitutionToken);
             return "";
         }
-	std::cerr << "Current match: " << matchResult << std::endl;
+	//std::cerr << "Current match: " << matchResult << std::endl;
 
 	result = replace(result, substitutionToken, matchResult);
 
@@ -398,7 +399,7 @@ XrdCmsTfc::TrivialFileCatalog::applyRules (const ProtocolRules& protocolRules,
 				      bool direct,
 				      std::string name) const
 {
-    std::cerr << "Calling apply rules with protocol: " << protocol << "\n destination: " << destination << "\n " << " on name " << name << std::endl;
+    //std::cerr << "Calling apply rules with protocol: " << protocol << "\n destination: " << destination << "\n " << " on name " << name << std::endl;
 
     const ProtocolRules::const_iterator rulesIterator = protocolRules.find (protocol);
     if (rulesIterator == protocolRules.end())
@@ -417,25 +418,25 @@ XrdCmsTfc::TrivialFileCatalog::applyRules (const ProtocolRules& protocolRules,
 	if (rc < 0) {
 	    continue;
         } else {
-            std::cerr << "Destination did match; my destination " << destination << ", regexp: " << i->destinationMatchStr << std::endl;
+            //std::cerr << "Destination did match; my destination " << destination << ", regexp: " << i->destinationMatchStr << std::endl;
         }
 
         rc = pcre_exec(i->pathMatch, NULL, name.c_str(), name.length(), 0, 0, ovector, OVECCOUNT);
 	if (rc < 0) {
 	    continue;
         } else {
-            std::cerr << "Path did match; my path " << name << ", regexp: " << i->pathMatchStr << std::endl;
+            //std::cerr << "Path did match; my path " << name << ", regexp: " << i->pathMatchStr << std::endl;
         }
 
-	std::cerr << "Rule matched; path: " << i->pathMatchStr << std::endl;	
+	//std::cerr << "Rule matched; path: " << i->pathMatchStr << std::endl;	
 
 	std::string chain = i->chain;
 	if ((direct==true) && (chain != ""))
 	{
 	    name = 
 		applyRules (protocolRules, chain, destination, direct, name);		
 	} else {
-            std::cerr << "Not chaining another rule." << std::endl;
+            //std::cerr << "Not chaining another rule!" << std::endl;
         }
 
         rc = pcre_exec(i->pathMatch, NULL, name.c_str(), name.length(), 0, 0, ovector,
@@ -444,15 +445,15 @@ XrdCmsTfc::TrivialFileCatalog::applyRules (const ProtocolRules& protocolRules,
         if (rc >= 0) {
             name = replaceWithRegexp(ovector, rc, name, i->result);
         } else {
-            std::cerr << "No replacements necessary." << std::endl;
+            //std::cerr << "No replacements necessary." << std::endl;
         }
 
 	if ((direct == false) && (chain !=""))
 	{	
 	    name = 
 		applyRules (protocolRules, chain, destination, direct, name);		
 	}
-	std::cerr << "Result " << name << std::endl;
+	//std::cerr << "Result " << name << std::endl;
 	return name;
     }
     return "";