fixing url encoding bug in cacheBot and a little refactoring
minor javascript syntax issues
copy drupal7 dataportal module into trunk