from django.conf.urls import patterns, url
from hs_core import views
from django.conf import settings

urlpatterns = patterns('',

    # URLs to resolve hydroshare file urls that are part of the resourcemap xml document

    url(r'^resource/(?P<shortkey>[A-z0-9]+)/data/([^/]+)/$', views.file_download_url_mapper,
        name='get_resourcemap_or_metadata_file'),

    url(r'^resource/(?P<shortkey>[A-z0-9]+)/data/contents/([^/]+)/$', views.file_download_url_mapper,
        name='get_resource_file'),

    url(r'^resource/([A-z0-9]+)/home/{}/(?P<shortkey>[A-z0-9]+)/data/([^/]+)/$'.format(settings.HS_LOCAL_PROXY_USER_IN_FED_ZONE),
        views.file_download_url_mapper, name='get_resourcemap_or_metadata_file'),

    url(r'^resource/([A-z0-9]+)/home/{}/(?P<shortkey>[A-z0-9]+)/data/contents/([^/]+)/$'.format(settings.HS_LOCAL_PROXY_USER_IN_FED_ZONE),
        views.file_download_url_mapper, name='get_resource_file'),
     )

from django.conf.urls import patterns, url
from hs_core import views
from django.conf import settings

urlpatterns = patterns('',

    # URLs to resolve hydroshare file urls that are part of the resourcemap xml document

    url(r'^resource/(?P<shortkey>[A-z0-9]+)/data/([^/]+)/$', views.file_download_url_mapper,
        name='get_resourcemap_or_metadata_file'),

    url(r'^resource/(?P<shortkey>[A-z0-9]+)/data/contents/([^/]+)/$', views.file_download_url_mapper,
        name='get_resource_file'),

    url(r'^resource/([A-z0-9]+)/home/{}/(?P<shortkey>[A-z0-9]+)/data/([^/]+)/$'.format(settings.HS_LOCAL_PROXY_USER_IN_FED_ZONE),
        views.file_download_url_mapper, name='get_resourcemap_or_metadata_file'),

    url(r'^resource/([A-z0-9]+)/home/{}/(?P<shortkey>[A-z0-9]+)/data/contents/([^/]+)/$'.format(settings.HS_LOCAL_PROXY_USER_IN_FED_ZONE),
        views.file_download_url_mapper, name='get_resource_file'),
     )
Remove merge conflict