181 # includeparams=True for modconcat-like urls |
181 # includeparams=True for modconcat-like urls |
182 relpath = self.relpath |
182 relpath = self.relpath |
183 if relpath.startswith(self.data_modconcat_basepath): |
183 if relpath.startswith(self.data_modconcat_basepath): |
184 paths = relpath[len(self.data_modconcat_basepath):].split(',') |
184 paths = relpath[len(self.data_modconcat_basepath):].split(',') |
185 filepath = self.concat_files_registry.concat_cached_filepath(paths) |
185 filepath = self.concat_files_registry.concat_cached_filepath(paths) |
186 return self.static_file(filepath) |
|
187 else: |
186 else: |
188 relpath = relpath[len(self.base_datapath):] # skip leading '/data/' |
187 # skip leading '/data/' and url params |
189 dirpath, rid = config.locate_resource(relpath) |
188 relpath = relpath[len(self.base_datapath):].split('?', 1)[0] |
190 if dirpath is None: |
189 dirpath, rid = config.locate_resource(relpath) |
191 raise NotFound() |
190 if dirpath is None: |
192 return self.static_file(osp.join(dirpath, rid)) |
191 raise NotFound() |
|
192 filepath = osp.join(dirpath, rid) |
|
193 return self.static_file(filepath) |
193 |
194 |
194 |
195 |
195 class FCKEditorController(StaticFileController): |
196 class FCKEditorController(StaticFileController): |
196 """Controller in charge of serving FCKEditor related file |
197 """Controller in charge of serving FCKEditor related file |
197 |
198 |