Index: bin/shell/clearcache.sh
===================================================================
--- bin/shell/clearcache.sh	(revision 17392)
+++ bin/shell/clearcache.sh	(working copy)
@@ -17,7 +17,6 @@
 CLEAR_RSS="0"
 CLEAR_CODEPAGE="0"
 CLEAR_TRANS="0"
-CLEAR_USER_INFO="0"
 
 # Check parameters
 for arg in $*; do
@@ -42,8 +41,8 @@
             echo "         --clear-classidentifiers   Remove class identifier cache"
 	    echo "         --clear-rss                Remove RSS cache"
 	    echo "         --clear-transformations    Remove character transformation cache"
-	    echo "         --clear-user-info          Remove user-info cache"
             echo "         --clear-all                Remove all above caches"
+      echo "         --siteaccess=<siteaccess>  remove only the cache for this site access"
             echo
             echo "Example:"
             echo "$0 --clear-image --clear-tpl"
@@ -56,6 +55,10 @@
 		echo "No subdir specified, ignoring"
 	    fi
 	    ;;
+  --siteaccess*)
+      SITEACCESS=`echo $arg | sed 's/--siteaccess=//'`
+      echo "only clean cache for $SITEACCESS"
+      ;;
 	--clear-content)
 	    CLEAR_CONTENT="1"
 	    ;;
@@ -98,10 +101,6 @@
        --clear-transformations)
 	    CLEAR_TRANS="1"
 	    ;;
-       --clear-user-info)
-	    CLEAR_USER_INFO="1"
-	    ;;
-
 	--clear-all)
 	    CLEAR_CONTENT="1"
 	    CLEAR_IMAGE="1"
@@ -117,7 +116,6 @@
             CLEAR_CLASSIDENTIFIER="1"
 	    CLEAR_RSS="1"
 	    CLEAR_TRANS="1"
-	    CLEAR_USER_INFO="1"
 	    ;;
 	*)
 	    echo "$arg: unkown option specified"
@@ -149,6 +147,19 @@
 
 VAR_DIRS="$DIR"
 
+if [ -d "$SETTINGS_DIR/siteaccess/$SITEACCESS" ]; then
+	 SITEACCESS_DIR=`basename $SETTINGS_DIR/siteaccess/$SITEACCESS`
+	if echo  SITEACCESS_DIR | grep -e "_user$" >/dev/null; then
+	    SITEACCESS_DIR=`echo $dirname | sed 's/_user//'`
+	elif echo  SITEACCESS_DIR | grep -e "_admin$" >/dev/null; then
+	    SITEACCESS_DIR=`echo $dirname | sed 's/_admin//'`
+  fi
+else 
+  echo "siteaccess $SITEACCESS not found";
+  exit 1
+fi
+echo $SITEACCESS_DIR
+
 if [ -z "$VAR_SUBDIR" ]; then
     for siteaccess in $SITEACCESS_DIR; do
 	VAR_DIRS="$VAR_DIRS $VAR_DIR/$siteaccess"
@@ -175,7 +186,6 @@
         CLASSATTRIBUTEIDENTIFIER_CACHEFILE="$DIR/cache/classattributeidentifiers_"
 	RSS_CACHEDIR="$DIR/cache/rss"
 	TRANS_CACHEDIR="$DIR/cache/trans"
-        USER_INFO_CACHEDIR="$DIR/cache/user-info"
    
 
 	if [ "$CLEAR_CONTENT" -eq 1 ]; then
@@ -268,13 +278,6 @@
 	    fi
 	fi
 
-	if [ "$CLEAR_USER_INFO" -eq 1 ]; then
-	    if [ -d "$USER_INFO_CACHEDIR" ]; then
-		echo "Removing user-info cache files in $USER_INFO_CACHEDIR"
-		rm -rf "$USER_INFO_CACHEDIR"
-	    fi
-	fi
-
         if [ "$CLEAR_CLASSIDENTIFIER" -eq 1 ]; then
             echo "Removing class identifier cache files in $CLASSIDENTIFIER_CACHEFILE"
             rm -f "$CLASSIDENTIFIER_CACHEFILE"*.php